diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-08 12:05:56 +0100 |
---|---|---|
committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-02-08 13:06:51 +0200 |
commit | 52a76539ff0dec500a93ff5b13076c36b2b67b5a (patch) | |
tree | feea75a9ee4b909caf14a7ad37a90ddddc371e4b /src/controls/qquickabstractstackview_p.h | |
parent | 8b2a1ec43134e191a5f9bb08a73f1a694d52927d (diff) |
Use Q_ENUM instead of Q_ENUMS
Change-Id: I01d6a9bcb097ae9a3f3946b388e3d15dfda07f6f
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickabstractstackview_p.h')
-rw-r--r-- | src/controls/qquickabstractstackview_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/qquickabstractstackview_p.h b/src/controls/qquickabstractstackview_p.h index 93545cd1..5bdc644c 100644 --- a/src/controls/qquickabstractstackview_p.h +++ b/src/controls/qquickabstractstackview_p.h @@ -51,7 +51,6 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractStackView : public QQuickAbstractCont Q_PROPERTY(int depth READ depth WRITE setDepth NOTIFY depthChanged FINAL) // TODO: hide setDepth Q_PROPERTY(QQuickItem *currentItem READ currentItem WRITE setCurrentItem NOTIFY currentItemChanged FINAL) // TODO: hide setCurrentItem Q_PROPERTY(QVariant initialItem READ initialItem WRITE setInitialItem FINAL) - Q_ENUMS(Operation) public: explicit QQuickAbstractStackView(QQuickItem *parent = Q_NULLPTR); @@ -73,6 +72,7 @@ public: Transition, Immediate }; + Q_ENUM(Operation) Q_INVOKABLE QQuickItem *qpush(QQmlV4Function *args); Q_INVOKABLE QQuickItem *qpop(QQmlV4Function *args); @@ -99,7 +99,6 @@ class Q_QUICKCONTROLS_EXPORT QQuickStackAttached : public QObject { Q_OBJECT Q_PROPERTY(Status status READ status WRITE setStatus NOTIFY statusChanged) - Q_ENUMS(Status) public: explicit QQuickStackAttached(QObject *parent = Q_NULLPTR); @@ -112,6 +111,7 @@ public: Activating = 2, Active = 3 }; + Q_ENUM(Status) Status status() const; void setStatus(Status status); |