diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-02-07 13:00:49 +0100 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2015-02-08 12:19:07 +0000 |
| commit | 163b8529516ddda24833f635f737863ba98bd688 (patch) | |
| tree | cf7fbb32c6f240526132e6a69f214e31a2cbaf3e /src/widgets/kernel/qaction.h | |
| parent | e768d96e8bc161211b2d4ad377f3fb250f270a9b (diff) | |
QtWidgets: use Q_ENUM instead of Q_ENUMS
Change-Id: Id5280c1d9feab95e1506569f3d0eb23eeb74935f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/kernel/qaction.h')
| -rw-r--r-- | src/widgets/kernel/qaction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index 4fc4b424f6..db8231002c 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -55,8 +55,6 @@ class Q_WIDGETS_EXPORT QAction : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QAction) - Q_ENUMS(MenuRole) - Q_ENUMS(Priority) Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY changed) Q_PROPERTY(bool checked READ isChecked WRITE setChecked DESIGNABLE isCheckable NOTIFY toggled) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY changed) @@ -81,9 +79,11 @@ public: // note this is copied into qplatformmenu.h, which must stay in sync enum MenuRole { NoRole = 0, TextHeuristicRole, ApplicationSpecificRole, AboutQtRole, AboutRole, PreferencesRole, QuitRole }; + Q_ENUM(MenuRole) enum Priority { LowPriority = 0, NormalPriority = 128, HighPriority = 256}; + Q_ENUM(Priority) explicit QAction(QObject* parent); QAction(const QString &text, QObject* parent); QAction(const QIcon &icon, const QString &text, QObject* parent); |