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>

35 files changed, 78 insertions, 80 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h
index bcd7072903..4a1a59d61e 100644
--- a/src/quick/items/context2d/qquickcanvasitem_p.h
+++ b/src/quick/items/context2d/qquickcanvasitem_p.h
@@ -68,8 +68,6 @@ private:
 class QQuickCanvasItem : public QQuickItem
 {
     Q_OBJECT
-    Q_ENUMS(RenderTarget)
-    Q_ENUMS(RenderStrategy)
 
     Q_PROPERTY(bool available READ isAvailable NOTIFY availableChanged)
     Q_PROPERTY(QString contextType READ contextType WRITE setContextType NOTIFY contextTypeChanged)
@@ -85,12 +83,14 @@ public:
         Image,
         FramebufferObject
     };
+    Q_ENUM(RenderTarget)
 
     enum RenderStrategy {
         Immediate,
         Threaded,
         Cooperative
     };
+    Q_ENUM(RenderStrategy)
 
     QQuickCanvasItem(QQuickItem *parent = 0);
     ~QQuickCanvasItem();
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h
index 4778afc88b..a10ebb4b73 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -70,12 +70,12 @@ class Q_AUTOTEST_EXPORT QQuickAnimatedSprite : public QQuickItem
     Q_PROPERTY(bool paused READ paused WRITE setPaused NOTIFY pausedChanged)
     Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame NOTIFY currentFrameChanged)
 
-    Q_ENUMS(LoopParameters)
 public:
     explicit QQuickAnimatedSprite(QQuickItem *parent = 0);
     enum LoopParameters {
         Infinite = -1
     };
+    Q_ENUM(LoopParameters)
 
     bool running() const
     {
diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h
index f2a172fad3..8a88e3d0d3 100644
--- a/src/quick/items/qquickborderimage_p.h
+++ b/src/quick/items/qquickborderimage_p.h
@@ -44,7 +44,6 @@ class QQuickBorderImagePrivate;
 class Q_AUTOTEST_EXPORT QQuickBorderImage : public QQuickImageBase
 {
     Q_OBJECT
-    Q_ENUMS(TileMode)
 
     Q_PROPERTY(QQuickScaleGrid *border READ border CONSTANT)
     Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY horizontalTileModeChanged)
@@ -59,6 +58,7 @@ public:
     QQuickScaleGrid *border();
 
     enum TileMode { Stretch = Qt::StretchTile, Repeat = Qt::RepeatTile, Round = Qt::RoundTile };
+    Q_ENUM(TileMode)
 
     TileMode horizontalTileMode() const;
     void setHorizontalTileMode(TileMode);
diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h
index 4bd4cfc6fd..2b4b2a51d4 100644
--- a/src/quick/items/qquickdrag_p.h
+++ b/src/quick/items/qquickdrag_p.h
@@ -140,7 +140,6 @@ class Q_AUTOTEST_EXPORT QQuickDrag : public QObject
 {
     Q_OBJECT
 
-    Q_ENUMS(Axis DragType)
     Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged RESET resetTarget)
     Q_PROPERTY(Axis axis READ axis WRITE setAxis NOTIFY axisChanged)
     Q_PROPERTY(qreal minimumX READ xmin WRITE setXmin NOTIFY minimumXChanged)
@@ -160,12 +159,14 @@ public:
     ~QQuickDrag();
 
     enum DragType { None, Automatic, Internal };
+    Q_ENUM(DragType)
 
     QQuickItem *target() const;
     void setTarget(QQuickItem *target);
     void resetTarget();
 
     enum Axis { XAxis=0x01, YAxis=0x02, XAndYAxis=0x03, XandYAxis=XAndYAxis };
+    Q_ENUM(Axis)
     Axis axis() const;
     void setAxis(Axis);
 
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index 3c3cd362dd..c974da66d6 100644
--- a/src/quick/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -93,7 +93,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem
     Q_PROPERTY(QQmlListProperty<QQuickItem> flickableChildren READ flickableChildren)
     Q_CLASSINFO("DefaultProperty", "flickableData")
 
-    Q_ENUMS(FlickableDirection)
     Q_FLAGS(BoundsBehavior)
 
 public:
@@ -177,6 +176,7 @@ public:
     QQuickItem *contentItem();
 
     enum FlickableDirection { AutoFlickDirection=0x00, HorizontalFlick=0x01, VerticalFlick=0x02, HorizontalAndVerticalFlick=0x03 };
+    Q_ENUM(FlickableDirection)
     FlickableDirection flickableDirection() const;
     void setFlickableDirection(FlickableDirection);
 
diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h
index bd2efe0676..31bfe97923 100644
--- a/src/quick/items/qquickflipable_p.h
+++ b/src/quick/items/qquickflipable_p.h
@@ -47,7 +47,6 @@ class Q_AUTOTEST_EXPORT QQuickFlipable : public QQuickItem
 {
     Q_OBJECT
 
-    Q_ENUMS(Side)
     Q_PROPERTY(QQuickItem *front READ front WRITE setFront NOTIFY frontChanged)
     Q_PROPERTY(QQuickItem *back READ back WRITE setBack NOTIFY backChanged)
     Q_PROPERTY(Side side READ side NOTIFY sideChanged)
@@ -64,6 +63,7 @@ public:
     void setBack(QQuickItem *);
 
     enum Side { Front, Back };
+    Q_ENUM(Side)
     Side side() const;
 
 Q_SIGNALS:
diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h
index 7e1ace01dd..389ef27585 100644
--- a/src/quick/items/qquickgridview_p.h
+++ b/src/quick/items/qquickgridview_p.h
@@ -52,8 +52,6 @@ class Q_AUTOTEST_EXPORT QQuickGridView : public QQuickItemView
 
     Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged)
 
-    Q_ENUMS(SnapMode)
-    Q_ENUMS(Flow)
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
@@ -61,6 +59,7 @@ public:
         FlowLeftToRight = LeftToRight,
         FlowTopToBottom = TopToBottom
     };
+    Q_ENUM(Flow)
 
     QQuickGridView(QQuickItem *parent=0);
     ~QQuickGridView();
@@ -78,6 +77,7 @@ public:
     void setCellHeight(qreal);
 
     enum SnapMode { NoSnap, SnapToRow, SnapOneRow };
+    Q_ENUM(SnapMode)
     SnapMode snapMode() const;
     void setSnapMode(SnapMode mode);
 
diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h
index 443d796c44..b8a0b3b86f 100644
--- a/src/quick/items/qquickimage_p.h
+++ b/src/quick/items/qquickimage_p.h
@@ -43,9 +43,6 @@ class QQuickImagePrivate;
 class Q_QUICK_PRIVATE_EXPORT QQuickImage : public QQuickImageBase
 {
     Q_OBJECT
-    Q_ENUMS(FillMode)
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(VAlignment)
 
     Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
     Q_PROPERTY(qreal paintedWidth READ paintedWidth NOTIFY paintedGeometryChanged)
@@ -62,11 +59,14 @@ public:
     enum HAlignment { AlignLeft = Qt::AlignLeft,
                        AlignRight = Qt::AlignRight,
                        AlignHCenter = Qt::AlignHCenter };
+    Q_ENUM(HAlignment)
     enum VAlignment { AlignTop = Qt::AlignTop,
                        AlignBottom = Qt::AlignBottom,
                        AlignVCenter = Qt::AlignVCenter };
+    Q_ENUM(VAlignment)
 
     enum FillMode { Stretch, PreserveAspectFit, PreserveAspectCrop, Tile, TileVertically, TileHorizontally, Pad };
+    Q_ENUM(FillMode)
 
     FillMode fillMode() const;
     void setFillMode(FillMode);
diff --git a/src/quick/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h
index d43822bebe..638b8dbdcf 100644
--- a/src/quick/items/qquickimagebase_p.h
+++ b/src/quick/items/qquickimagebase_p.h
@@ -43,7 +43,6 @@ class QQuickImageBasePrivate;
 class Q_QUICK_PRIVATE_EXPORT QQuickImageBase : public QQuickImplicitSizeItem
 {
     Q_OBJECT
-    Q_ENUMS(Status)
 
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -57,6 +56,7 @@ public:
     QQuickImageBase(QQuickItem *parent=0);
     ~QQuickImageBase();
     enum Status { Null, Ready, Loading, Error };
+    Q_ENUM(Status)
     Status status() const;
     qreal progress() const;
 
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 463113386b..d92910ce9c 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -141,7 +141,6 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus
 
     Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickItemLayer *layer READ layer DESIGNABLE false CONSTANT FINAL)
 
-    Q_ENUMS(TransformOrigin)
     Q_CLASSINFO("DefaultProperty", "data")
     Q_CLASSINFO("qt_HasQmlAccessors", "true")
 
@@ -187,6 +186,7 @@ public:
         Left, Center, Right,
         BottomLeft, Bottom, BottomRight
     };
+    Q_ENUM(TransformOrigin)
 
     QQuickItem(QQuickItem *parent = 0);
     virtual ~QQuickItem();
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);
 
diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h
index 907687a2bd..9f0b3dccb8 100644
--- a/src/quick/items/qquickitemanimation_p.h
+++ b/src/quick/items/qquickitemanimation_p.h
@@ -136,7 +136,7 @@ public:
         BottomFirst,
         TopFirst
     };
-    Q_ENUMS(Orientation)
+    Q_ENUM(Orientation)
 
     int duration() const;
     void setDuration(int);
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index 6e5ae032c2..3e28ff336d 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -88,11 +88,6 @@ class Q_AUTOTEST_EXPORT QQuickItemView : public QQuickFlickable
     Q_PROPERTY(qreal preferredHighlightEnd READ preferredHighlightEnd WRITE setPreferredHighlightEnd NOTIFY preferredHighlightEndChanged RESET resetPreferredHighlightEnd)
     Q_PROPERTY(int highlightMoveDuration READ highlightMoveDuration WRITE setHighlightMoveDuration NOTIFY highlightMoveDurationChanged)
 
-    Q_ENUMS(HighlightRangeMode)
-    Q_ENUMS(PositionMode)
-    Q_ENUMS(VerticalLayoutDirection)
-    Q_ENUMS(LayoutDirection)
-
 public:
     // this holds all layout enum values so they can be referred to by other enums
     // to ensure consistent values - e.g. QML references to GridView.TopToBottom flow
@@ -103,11 +98,13 @@ public:
         VerticalTopToBottom,
         VerticalBottomToTop
     };
+    Q_ENUM(LayoutDirection)
 
     enum VerticalLayoutDirection {
         TopToBottom = VerticalTopToBottom,
         BottomToTop = VerticalBottomToTop
     };
+    Q_ENUM(VerticalLayoutDirection)
 
     QQuickItemView(QQuickFlickablePrivate &dd, QQuickItem *parent = 0);
     ~QQuickItemView();
@@ -185,6 +182,7 @@ public:
     virtual void setHighlightFollowsCurrentItem(bool);
 
     enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange };
+    Q_ENUM(HighlightRangeMode)
     HighlightRangeMode highlightRangeMode() const;
     void setHighlightRangeMode(HighlightRangeMode mode);
 
@@ -200,6 +198,7 @@ public:
     virtual void setHighlightMoveDuration(int);
 
     enum PositionMode { Beginning, Center, End, Visible, Contain, SnapPosition };
+    Q_ENUM(PositionMode)
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
     Q_INVOKABLE int indexAt(qreal x, qreal y) const;
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index bcb4e18751..7f64e12bba 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -47,8 +47,6 @@ class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject
     Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY criteriaChanged)
     Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(int labelPositioning READ labelPositioning WRITE setLabelPositioning NOTIFY labelPositioningChanged)
-    Q_ENUMS(SectionCriteria)
-    Q_ENUMS(LabelPositioning)
 public:
     QQuickViewSection(QQuickListView *parent=0);
 
@@ -56,6 +54,7 @@ public:
     void setProperty(const QString &);
 
     enum SectionCriteria { FullString, FirstCharacter };
+    Q_ENUM(SectionCriteria)
     SectionCriteria criteria() const { return m_criteria; }
     void setCriteria(SectionCriteria);
 
@@ -65,6 +64,7 @@ public:
     QString sectionString(const QString &value);
 
     enum LabelPositioning { InlineLabels = 0x01, CurrentLabelAtStart = 0x02, NextLabelAtEnd = 0x04 };
+    Q_ENUM(LabelPositioning)
     int labelPositioning() { return m_labelPositioning; }
     void setLabelPositioning(int pos);
 
@@ -106,10 +106,6 @@ class Q_AUTOTEST_EXPORT QQuickListView : public QQuickItemView
     Q_PROPERTY(HeaderPositioning headerPositioning READ headerPositioning WRITE setHeaderPositioning NOTIFY headerPositioningChanged REVISION 2)
     Q_PROPERTY(FooterPositioning footerPositioning READ footerPositioning WRITE setFooterPositioning NOTIFY footerPositioningChanged REVISION 2)
 
-    Q_ENUMS(Orientation)
-    Q_ENUMS(SnapMode)
-    Q_ENUMS(HeaderPositioning)
-    Q_ENUMS(FooterPositioning)
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
@@ -120,6 +116,7 @@ public:
     void setSpacing(qreal spacing);
 
     enum Orientation { Horizontal = Qt::Horizontal, Vertical = Qt::Vertical };
+    Q_ENUM(Orientation)
     Orientation orientation() const;
     void setOrientation(Orientation);
 
@@ -140,14 +137,17 @@ public:
     void setHighlightMoveDuration(int) Q_DECL_OVERRIDE;
 
     enum SnapMode { NoSnap, SnapToItem, SnapOneItem };
+    Q_ENUM(SnapMode)
     SnapMode snapMode() const;
     void setSnapMode(SnapMode mode);
 
     enum HeaderPositioning { InlineHeader, OverlayHeader, PullBackHeader };
+    Q_ENUM(HeaderPositioning)
     HeaderPositioning headerPositioning() const;
     void setHeaderPositioning(HeaderPositioning positioning);
 
     enum FooterPositioning { InlineFooter, OverlayFooter, PullBackFooter };
+    Q_ENUM(FooterPositioning)
     FooterPositioning footerPositioning() const;
     void setFooterPositioning(FooterPositioning positioning);
 
diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h
index 2c0e98de59..6ed4f2437b 100644
--- a/src/quick/items/qquickloader_p.h
+++ b/src/quick/items/qquickloader_p.h
@@ -42,7 +42,6 @@ class QQuickLoaderPrivate;
 class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem
 {
     Q_OBJECT
-    Q_ENUMS(Status)
 
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -69,6 +68,7 @@ public:
     void resetSourceComponent();
 
     enum Status { Null, Ready, Loading, Error };
+    Q_ENUM(Status)
     Status status() const;
     qreal progress() const;
 
diff --git a/src/quick/items/qquickopenglinfo_p.h b/src/quick/items/qquickopenglinfo_p.h
index 2a2e2a719b..511413c814 100644
--- a/src/quick/items/qquickopenglinfo_p.h
+++ b/src/quick/items/qquickopenglinfo_p.h
@@ -63,7 +63,6 @@ class QQuickOpenGLInfo : public QObject
     Q_PROPERTY(int minorVersion READ minorVersion NOTIFY minorVersionChanged FINAL)
     Q_PROPERTY(ContextProfile profile READ profile NOTIFY profileChanged FINAL)
     Q_PROPERTY(RenderableType renderableType READ renderableType NOTIFY renderableTypeChanged FINAL)
-    Q_ENUMS(ContextProfile RenderableType)
 
 public:
     QQuickOpenGLInfo(QQuickItem *item = 0);
@@ -77,6 +76,7 @@ public:
         CoreProfile = QSurfaceFormat::CoreProfile,
         CompatibilityProfile = QSurfaceFormat::CompatibilityProfile
     };
+    Q_ENUM(ContextProfile)
     ContextProfile profile() const;
 
     // keep in sync with QSurfaceFormat::RenderableType
@@ -85,6 +85,7 @@ public:
         OpenGL = QSurfaceFormat::OpenGL,
         OpenGLES = QSurfaceFormat::OpenGLES
     };
+    Q_ENUM(RenderableType)
     RenderableType renderableType() const;
 
     static QQuickOpenGLInfo *qmlAttachedProperties(QObject *object);
diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h
index 356e4a46f6..28eb3398a0 100644
--- a/src/quick/items/qquickpainteditem.h
+++ b/src/quick/items/qquickpainteditem.h
@@ -43,7 +43,6 @@ class QQuickPaintedItemPrivate;
 class Q_QUICK_EXPORT QQuickPaintedItem : public QQuickItem
 {
     Q_OBJECT
-    Q_ENUMS(RenderTarget)
 
     Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize NOTIFY contentsSizeChanged)
     Q_PROPERTY(QColor fillColor READ fillColor WRITE setFillColor NOTIFY fillColorChanged)
@@ -58,6 +57,7 @@ public:
         FramebufferObject,
         InvertedYFramebufferObject
     };
+    Q_ENUM(RenderTarget)
 
     enum PerformanceHint {
         FastFBOResizing = 0x1
diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h
index 8062e07795..0f2e4a956c 100644
--- a/src/quick/items/qquickpathview_p.h
+++ b/src/quick/items/qquickpathview_p.h
@@ -78,10 +78,6 @@ class Q_AUTOTEST_EXPORT QQuickPathView : public QQuickItem
 
     Q_PROPERTY(int cacheItemCount READ cacheItemCount WRITE setCacheItemCount NOTIFY cacheItemCountChanged)
 
-    Q_ENUMS(HighlightRangeMode)
-    Q_ENUMS(SnapMode)
-    Q_ENUMS(PositionMode)
-
 public:
     QQuickPathView(QQuickItem *parent=0);
     virtual ~QQuickPathView();
@@ -105,6 +101,7 @@ public:
     QQuickItem *highlightItem();
 
     enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange };
+    Q_ENUM(HighlightRangeMode)
     HighlightRangeMode highlightRangeMode() const;
     void setHighlightRangeMode(HighlightRangeMode mode);
 
@@ -146,10 +143,12 @@ public:
     void setCacheItemCount(int);
 
     enum SnapMode { NoSnap, SnapToItem, SnapOneItem };
+    Q_ENUM(SnapMode)
     SnapMode snapMode() const;
     void setSnapMode(SnapMode mode);
 
     enum PositionMode { Beginning, Center, End, Contain=4, SnapPosition }; // 3 == Visible in other views
+    Q_ENUM(PositionMode)
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
     Q_INVOKABLE int indexAt(qreal x, qreal y) const;
     Q_INVOKABLE QQuickItem *itemAt(qreal x, qreal y) const;
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index d2de59b5d6..602b2804cc 100644
--- a/src/quick/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -42,7 +42,6 @@ class Q_AUTOTEST_EXPORT QQuickPinch : public QObject
 {
     Q_OBJECT
 
-    Q_ENUMS(Axis)
     Q_PROPERTY(QQuickItem *target READ target WRITE setTarget RESET resetTarget)
     Q_PROPERTY(qreal minimumScale READ minimumScale WRITE setMinimumScale NOTIFY minimumScaleChanged)
     Q_PROPERTY(qreal maximumScale READ maximumScale WRITE setMaximumScale NOTIFY maximumScaleChanged)
@@ -103,6 +102,7 @@ public:
     }
 
     enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, XAndYAxis=0x03, XandYAxis=XAndYAxis };
+    Q_ENUM(Axis)
     Axis axis() const { return m_axis; }
     void setAxis(Axis a) {
         if (a == m_axis)
diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index 6323405022..bc67701306 100644
--- a/src/quick/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -274,8 +274,8 @@ public:
     void setColumnSpacing(qreal);
     void resetColumnSpacing() { m_useColumnSpacing = false; }
 
-    Q_ENUMS(Flow)
     enum Flow { LeftToRight, TopToBottom };
+    Q_ENUM(Flow)
     Flow flow() const;
     void setFlow(Flow);
 
@@ -283,14 +283,14 @@ public:
     void setLayoutDirection (Qt::LayoutDirection);
     Qt::LayoutDirection effectiveLayoutDirection() const;
 
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(VAlignment)
     enum HAlignment { AlignLeft = Qt::AlignLeft,
                        AlignRight = Qt::AlignRight,
                        AlignHCenter = Qt::AlignHCenter};
+    Q_ENUM(HAlignment)
     enum VAlignment { AlignTop = Qt::AlignTop,
                        AlignBottom = Qt::AlignBottom,
                        AlignVCenter = Qt::AlignVCenter };
+    Q_ENUM(VAlignment)
 
     HAlignment hItemAlign() const;
     void setHItemAlign(HAlignment align);
@@ -339,8 +339,8 @@ class Q_AUTOTEST_EXPORT QQuickFlow: public QQuickBasePositioner
 public:
     QQuickFlow(QQuickItem *parent=0);
 
-    Q_ENUMS(Flow)
     enum Flow { LeftToRight, TopToBottom };
+    Q_ENUM(Flow)
     Flow flow() const;
     void setFlow(Flow);
 
diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h
index 7e0c021c19..b12da7a706 100644
--- a/src/quick/items/qquickscalegrid_p_p.h
+++ b/src/quick/items/qquickscalegrid_p_p.h
@@ -47,7 +47,6 @@ QT_BEGIN_NAMESPACE
 class QQuickScaleGrid : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(TileRule)
 
     Q_PROPERTY(int left READ left WRITE setLeft NOTIFY borderChanged)
     Q_PROPERTY(int top READ top WRITE setTop NOTIFY borderChanged)
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h
index 1c60d9feaa..75a8319615 100644
--- a/src/quick/items/qquickshadereffect_p.h
+++ b/src/quick/items/qquickshadereffect_p.h
@@ -92,8 +92,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffect : public QQuickItem
     Q_PROPERTY(QString log READ log NOTIFY logChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(bool supportsAtlasTextures READ supportsAtlasTextures WRITE setSupportsAtlasTextures NOTIFY supportsAtlasTexturesChanged REVISION 1)
-    Q_ENUMS(CullMode)
-    Q_ENUMS(Status)
 
 public:
     enum CullMode
@@ -102,6 +100,7 @@ public:
         BackFaceCulling = QQuickShaderEffectMaterial::BackFaceCulling,
         FrontFaceCulling = QQuickShaderEffectMaterial::FrontFaceCulling
     };
+    Q_ENUM(CullMode)
 
     enum Status
     {
@@ -109,6 +108,7 @@ public:
         Uncompiled,
         Error
     };
+    Q_ENUM(Status)
 
     QQuickShaderEffect(QQuickItem *parent = 0);
     ~QQuickShaderEffect();
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
index 31e503be42..94bb315566 100644
--- a/src/quick/items/qquickshadereffectsource_p.h
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -67,7 +67,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectSource : public QQuickItem, publi
     Q_PROPERTY(bool mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged)
     Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
 
-    Q_ENUMS(Format WrapMode)
 public:
     enum WrapMode {
         ClampToEdge,
@@ -75,12 +74,14 @@ public:
         RepeatVertically,
         Repeat
     };
+    Q_ENUM(WrapMode)
 
     enum Format {
         Alpha = GL_ALPHA,
         RGB = GL_RGB,
         RGBA = GL_RGBA
     };
+    Q_ENUM(Format)
 
     QQuickShaderEffectSource(QQuickItem *parent = 0);
     ~QQuickShaderEffectSource();
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index 31a7205304..f92927c9c4 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -45,15 +45,6 @@ class QQuickTextLine;
 class Q_QUICK_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem
 {
     Q_OBJECT
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(VAlignment)
-    Q_ENUMS(TextStyle)
-    Q_ENUMS(TextFormat)
-    Q_ENUMS(TextElideMode)
-    Q_ENUMS(WrapMode)
-    Q_ENUMS(LineHeightMode)
-    Q_ENUMS(FontSizeMode)
-    Q_ENUMS(RenderType)
 
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
@@ -98,21 +89,26 @@ public:
                        AlignRight = Qt::AlignRight,
                        AlignHCenter = Qt::AlignHCenter,
                        AlignJustify = Qt::AlignJustify };
+    Q_ENUM(HAlignment)
     enum VAlignment { AlignTop = Qt::AlignTop,
                        AlignBottom = Qt::AlignBottom,
                        AlignVCenter = Qt::AlignVCenter };
+    Q_ENUM(VAlignment)
     enum TextStyle { Normal,
                       Outline,
                       Raised,
                       Sunken };
+    Q_ENUM(TextStyle)
     enum TextFormat { PlainText = Qt::PlainText,
                        RichText = Qt::RichText,
                        AutoText = Qt::AutoText,
                        StyledText = 4 };
+    Q_ENUM(TextFormat)
     enum TextElideMode { ElideLeft = Qt::ElideLeft,
                           ElideRight = Qt::ElideRight,
                           ElideMiddle = Qt::ElideMiddle,
                           ElideNone = Qt::ElideNone };
+    Q_ENUM(TextElideMode)
 
     enum WrapMode { NoWrap = QTextOption::NoWrap,
                     WordWrap = QTextOption::WordWrap,
@@ -120,15 +116,19 @@ public:
                     WrapAtWordBoundaryOrAnywhere = QTextOption::WrapAtWordBoundaryOrAnywhere, // COMPAT
                     Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
                   };
+    Q_ENUM(WrapMode)
 
     enum RenderType { QtRendering,
                       NativeRendering
                     };
+    Q_ENUM(RenderType)
 
     enum LineHeightMode { ProportionalHeight, FixedHeight };
+    Q_ENUM(LineHeightMode)
 
     enum FontSizeMode { FixedSize = 0x0, HorizontalFit = 0x01, VerticalFit = 0x02,
                         Fit = HorizontalFit | VerticalFit };
+    Q_ENUM(FontSizeMode)
 
     QString text() const;
     void setText(const QString &);
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h
index f1ccd72ca9..bd85667a24 100644
--- a/src/quick/items/qquicktextedit_p.h
+++ b/src/quick/items/qquicktextedit_p.h
@@ -47,12 +47,6 @@ class QTextBlock;
 class Q_QUICK_PRIVATE_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem
 {
     Q_OBJECT
-    Q_ENUMS(VAlignment)
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(TextFormat)
-    Q_ENUMS(WrapMode)
-    Q_ENUMS(SelectionMode)
-    Q_ENUMS(RenderType)
 
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
@@ -108,18 +102,21 @@ public:
         AlignHCenter = Qt::AlignHCenter,
         AlignJustify = Qt::AlignJustify
     };
+    Q_ENUM(HAlignment)
 
     enum VAlignment {
         AlignTop = Qt::AlignTop,
         AlignBottom = Qt::AlignBottom,
         AlignVCenter = Qt::AlignVCenter
     };
+    Q_ENUM(VAlignment)
 
     enum TextFormat {
         PlainText = Qt::PlainText,
         RichText = Qt::RichText,
         AutoText = Qt::AutoText
     };
+    Q_ENUM(TextFormat)
 
     enum WrapMode { NoWrap = QTextOption::NoWrap,
                     WordWrap = QTextOption::WordWrap,
@@ -127,15 +124,18 @@ public:
                     WrapAtWordBoundaryOrAnywhere = QTextOption::WrapAtWordBoundaryOrAnywhere, // COMPAT
                     Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
                   };
+    Q_ENUM(WrapMode)
 
     enum SelectionMode {
         SelectCharacters,
         SelectWords
     };
+    Q_ENUM(SelectionMode)
 
     enum RenderType { QtRendering,
                       NativeRendering
                     };
+    Q_ENUM(RenderType)
 
     QString text() const;
     void setText(const QString &);
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index 333f55b35f..0880422f1f 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -45,13 +45,6 @@ class QValidator;
 class Q_QUICK_PRIVATE_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
 {
     Q_OBJECT
-    Q_ENUMS(HAlignment)
-    Q_ENUMS(VAlignment)
-    Q_ENUMS(WrapMode)
-    Q_ENUMS(EchoMode)
-    Q_ENUMS(SelectionMode)
-    Q_ENUMS(CursorPosition)
-    Q_ENUMS(RenderType)
 
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(int length READ length NOTIFY textChanged)
@@ -114,18 +107,21 @@ public:
         Password,
         PasswordEchoOnEdit
     };
+    Q_ENUM(EchoMode)
 
     enum HAlignment {
         AlignLeft = Qt::AlignLeft,
         AlignRight = Qt::AlignRight,
         AlignHCenter = Qt::AlignHCenter
     };
+    Q_ENUM(HAlignment)
 
     enum VAlignment {
         AlignTop = Qt::AlignTop,
         AlignBottom = Qt::AlignBottom,
         AlignVCenter = Qt::AlignVCenter
     };
+    Q_ENUM(VAlignment)
 
     enum WrapMode {
         NoWrap = QTextOption::NoWrap,
@@ -134,20 +130,24 @@ public:
         WrapAtWordBoundaryOrAnywhere = QTextOption::WrapAtWordBoundaryOrAnywhere, // COMPAT
         Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
     };
+    Q_ENUM(WrapMode)
 
     enum SelectionMode {
         SelectCharacters,
         SelectWords
     };
+    Q_ENUM(SelectionMode)
 
     enum CursorPosition {
         CursorBetweenCharacters,
         CursorOnCharacter
     };
+    Q_ENUM(CursorPosition)
 
     enum RenderType { QtRendering,
                       NativeRendering
                     };
+    Q_ENUM(RenderType)
 
     //Auxilliary functions needed to control the TextInput from QML
     Q_INVOKABLE void positionAt(QQmlV4Function *args) const;
diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h
index f094c5a216..80da0ba4f1 100644
--- a/src/quick/items/qquickview.h
+++ b/src/quick/items/qquickview.h
@@ -53,7 +53,6 @@ class Q_QUICK_EXPORT QQuickView : public QQuickWindow
     Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
-    Q_ENUMS(ResizeMode Status)
 public:
     explicit QQuickView(QWindow *parent = 0);
     QQuickView(QQmlEngine* engine, QWindow *parent);
@@ -68,10 +67,12 @@ public:
     QQuickItem *rootObject() const;
 
     enum ResizeMode { SizeViewToRootObject, SizeRootObjectToView };
+    Q_ENUM(ResizeMode)
     ResizeMode resizeMode() const;
     void setResizeMode(ResizeMode);
 
     enum Status { Null, Ready, Loading, Error };
+    Q_ENUM(Status)
     Status status() const;
 
     QList<QQmlError> errors() const;
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index 3d09e0c038..eb894d2271 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -87,7 +87,7 @@ public:
     enum SceneGraphError {
         ContextNotAvailable = 1
     };
-    Q_ENUMS(SceneGraphError)
+    Q_ENUM(SceneGraphError)
 
     QQuickWindow(QWindow *parent = 0);
     explicit QQuickWindow(QQuickRenderControl *renderControl);
diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h
index 0f6224a831..c4d5cd20cd 100644
--- a/src/quick/util/qquickanimation_p.h
+++ b/src/quick/util/qquickanimation_p.h
@@ -57,7 +57,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAbstractAnimation : public QObject, public QQ
 
     Q_INTERFACES(QQmlParserStatus)
     Q_INTERFACES(QQmlPropertyValueSource)
-    Q_ENUMS(Loops)
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
     Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
     Q_PROPERTY(bool alwaysRunToEnd READ alwaysRunToEnd WRITE setAlwaysRunToEnd NOTIFY alwaysRunToEndChanged)
@@ -75,6 +74,7 @@ public:
     virtual ~QQuickAbstractAnimation();
 
     enum Loops { Infinite = -2 };
+    Q_ENUM(Loops)
 
     bool isRunning() const;
     void setRunning(bool);
@@ -367,7 +367,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickRotationAnimation : public QQuickPropertyAnim
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickRotationAnimation)
-    Q_ENUMS(RotationDirection)
 
     Q_PROPERTY(qreal from READ from WRITE setFrom)
     Q_PROPERTY(qreal to READ to WRITE setTo)
@@ -384,6 +383,7 @@ public:
     void setTo(qreal);
 
     enum RotationDirection { Numerical, Shortest, Clockwise, Counterclockwise };
+    Q_ENUM(RotationDirection)
     RotationDirection direction() const;
     void setDirection(RotationDirection direction);
 
diff --git a/src/quick/util/qquickanimator_p.h b/src/quick/util/qquickanimator_p.h
index 4d3a8e9e4f..7647e582b8 100644
--- a/src/quick/util/qquickanimator_p.h
+++ b/src/quick/util/qquickanimator_p.h
@@ -136,10 +136,9 @@ class Q_QUICK_PRIVATE_EXPORT QQuickRotationAnimator : public QQuickAnimator
     Q_DECLARE_PRIVATE(QQuickRotationAnimator)
     Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged)
 
-    Q_ENUMS(RotationDirection)
-
 public:
     enum RotationDirection { Numerical, Shortest, Clockwise, Counterclockwise };
+    Q_ENUM(RotationDirection)
 
     QQuickRotationAnimator(QObject *parent = 0);
 
diff --git a/src/quick/util/qquickfontloader_p.h b/src/quick/util/qquickfontloader_p.h
index b6ca0b3c94..507d0210ee 100644
--- a/src/quick/util/qquickfontloader_p.h
+++ b/src/quick/util/qquickfontloader_p.h
@@ -46,7 +46,6 @@ class Q_AUTOTEST_EXPORT QQuickFontLoader : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickFontLoader)
-    Q_ENUMS(Status)
 
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
@@ -54,6 +53,7 @@ class Q_AUTOTEST_EXPORT QQuickFontLoader : public QObject
 
 public:
     enum Status { Null = 0, Ready, Loading, Error };
+    Q_ENUM(Status)
 
     QQuickFontLoader(QObject *parent = 0);
     ~QQuickFontLoader();
diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h
index eea313eeb1..5230a3cdea 100644
--- a/src/quick/util/qquickpath_p.h
+++ b/src/quick/util/qquickpath_p.h
@@ -265,7 +265,7 @@ public:
         : QQuickCurve(parent), _radiusX(0), _radiusY(0), _useLargeArc(false), _direction(Clockwise) {}
 
     enum ArcDirection { Clockwise, Counterclockwise };
-    Q_ENUMS(ArcDirection)
+    Q_ENUM(ArcDirection)
 
     qreal radiusX() const;
     void setRadiusX(qreal);
diff --git a/src/quick/util/qquicksmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h
index 68479aa629..efac9217f5 100644
--- a/src/quick/util/qquicksmoothedanimation_p.h
+++ b/src/quick/util/qquicksmoothedanimation_p.h
@@ -47,7 +47,6 @@ class Q_AUTOTEST_EXPORT QQuickSmoothedAnimation : public QQuickNumberAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickSmoothedAnimation)
-    Q_ENUMS(ReversingMode)
 
     Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity NOTIFY velocityChanged)
     Q_PROPERTY(ReversingMode reversingMode READ reversingMode WRITE setReversingMode NOTIFY reversingModeChanged)
@@ -55,6 +54,7 @@ class Q_AUTOTEST_EXPORT QQuickSmoothedAnimation : public QQuickNumberAnimation
 
 public:
     enum ReversingMode { Eased, Immediate, Sync };
+    Q_ENUM(ReversingMode)
 
     QQuickSmoothedAnimation(QObject *parent = 0);
     ~QQuickSmoothedAnimation();
diff --git a/src/quick/util/qquicksystempalette_p.h b/src/quick/util/qquicksystempalette_p.h
index 143efa1c12..fb898eb1fa 100644
--- a/src/quick/util/qquicksystempalette_p.h
+++ b/src/quick/util/qquicksystempalette_p.h
@@ -45,7 +45,6 @@ class QQuickSystemPalettePrivate;
 class Q_AUTOTEST_EXPORT QQuickSystemPalette : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(ColorGroup)
     Q_DECLARE_PRIVATE(QQuickSystemPalette)
 
     Q_PROPERTY(QQuickSystemPalette::ColorGroup colorGroup READ colorGroup WRITE setColorGroup NOTIFY paletteChanged)
@@ -69,6 +68,7 @@ public:
     ~QQuickSystemPalette();
 
     enum ColorGroup { Active = QPalette::Active, Inactive = QPalette::Inactive, Disabled = QPalette::Disabled };
+    Q_ENUM(ColorGroup)
 
     QColor window() const;
     QColor windowText() const;
diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h
index f62306ed01..1436d8e310 100644
--- a/src/quick/util/qquickvaluetypes_p.h
+++ b/src/quick/util/qquickvaluetypes_p.h
@@ -266,8 +266,6 @@ class QQuickFontValueType
 {
     QFont v;
     Q_GADGET
-    Q_ENUMS(FontWeight)
-    Q_ENUMS(Capitalization)
 
     Q_PROPERTY(QString family READ family WRITE setFamily FINAL)
     Q_PROPERTY(bool bold READ bold WRITE setBold FINAL)
@@ -292,11 +290,13 @@ public:
                       Bold = QFont::Bold,
                       ExtraBold = QFont::ExtraBold,
                       Black = QFont::Black };
+    Q_ENUM(FontWeight)
     enum Capitalization { MixedCase = QFont::MixedCase,
                            AllUppercase = QFont::AllUppercase,
                            AllLowercase = QFont::AllLowercase,
                            SmallCaps = QFont::SmallCaps,
                            Capitalize = QFont::Capitalize };
+    Q_ENUM(Capitalization)
 
     Q_INVOKABLE QString toString() const;