Port from Q_ENUMS to new macro Q_ENUM.

Remove Q_ENUMS in favor of the new Q_ENUM macro which provides registration
as meta enum and a debug stream operator.

QQuickXmlListModel::Status is left unmodified as porting it creates
a link error in tst_qquickxmllistmodel.

Change-Id: Id5e6192c9f85e7c94332508fbd91873ddda31e1a
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 64d8bd0ede..c0d06da829 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -645,8 +645,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickKeyNavigationAttached : public QObject, publi
     Q_PROPERTY(QQuickItem *backtab READ backtab WRITE setBacktab NOTIFY backtabChanged)
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
 
-    Q_ENUMS(Priority)
-
 public:
     QQuickKeyNavigationAttached(QObject * = 0);
 
@@ -664,6 +662,7 @@ public:
     void setBacktab(QQuickItem *);
 
     enum Priority { BeforeItem, AfterItem };
+    Q_ENUM(Priority)
     Priority priority() const;
     void setPriority(Priority);
 
@@ -739,8 +738,6 @@ class QQuickKeysAttached : public QObject, public QQuickItemKeyFilter
     Q_PROPERTY(QQmlListProperty<QQuickItem> forwardTo READ forwardTo)
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
 
-    Q_ENUMS(Priority)
-
 public:
     QQuickKeysAttached(QObject *parent=0);
     ~QQuickKeysAttached();
@@ -755,6 +752,7 @@ public:
     }
 
     enum Priority { BeforeItem, AfterItem};
+    Q_ENUM(Priority)
     Priority priority() const;
     void setPriority(Priority);