Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG

Change-Id: Ibedd0d0c23cf194ea02a229ab643450dbefd40aa
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

src/imports/layouts/qquicklinearlayout_p.h

@@ -152,8 +152,8 @@ public:
     int rows() const;
     void setRows(int rows);
 
-    Q_ENUMS(Flow)
     enum Flow { LeftToRight, TopToBottom };
+    Q_ENUM(Flow)
     Flow flow() const;
     void setFlow(Flow flow);
 

src/imports/xmllistmodel/qqmlxmllistmodel_p.h

@@ -79,7 +79,6 @@ class QQuickXmlListModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
-    Q_ENUMS(Status)
 
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
@@ -119,6 +118,7 @@ public:
     Q_INVOKABLE QQmlV4Handle get(int index) const;
 
     enum Status { Null, Ready, Loading, Error };
+    Q_ENUM(Status)
     Status status() const;
     qreal progress() const;
 

src/quick/items/qquickflickable_p.h

@@ -113,8 +113,6 @@ class Q_QUICK_PRIVATE_EXPORT QQuickFlickable : public QQuickItem
     Q_PROPERTY(QQmlListProperty<QQuickItem> flickableChildren READ flickableChildren)
     Q_CLASSINFO("DefaultProperty", "flickableData")
 
-    Q_FLAGS(BoundsBehavior)
-
 public:
     QQuickFlickable(QQuickItem *parent=0);
     ~QQuickFlickable();
@@ -129,6 +127,7 @@ public:
         DragAndOvershootBounds = DragOverBounds | OvershootBounds
     };
     Q_DECLARE_FLAGS(BoundsBehavior, BoundsBehaviorFlag)
+    Q_FLAG(BoundsBehavior)
 
     BoundsBehavior boundsBehavior() const;
     void setBoundsBehavior(BoundsBehavior);

tests/auto/quick/qquickxmllistmodel/qquickxmllistmodel.pro

@@ -2,7 +2,9 @@ CONFIG += testcase
 TARGET = tst_qquickxmllistmodel
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qquickxmllistmodel.cpp
+SOURCES += tst_qquickxmllistmodel.cpp \
+           ../../../../src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+HEADERS +=  ../../../../src/imports/xmllistmodel/qqmlxmllistmodel_p.h
 
 include (../../shared/util.pri)