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>

3 files changed, 7 insertions, 8 deletions

diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h
index 8c866c585a..121c83db5c 100644
--- a/src/qml/qml/qqmlcomponent.h
+++ b/src/qml/qml/qqmlcomponent.h
@@ -63,8 +63,8 @@ class Q_QML_EXPORT QQmlComponent : public QObject
     Q_PROPERTY(QUrl url READ url CONSTANT)
 
 public:
-    Q_ENUMS(CompilationMode)
     enum CompilationMode { PreferSynchronous, Asynchronous };
+    Q_ENUM(CompilationMode)
 
     QQmlComponent(QObject *parent = 0);
     QQmlComponent(QQmlEngine *, QObject *parent=0);
@@ -74,8 +74,8 @@ public:
     QQmlComponent(QQmlEngine *, const QUrl &url, CompilationMode mode, QObject *parent = 0);
     virtual ~QQmlComponent();
 
-    Q_ENUMS(Status)
     enum Status { Null, Ready, Loading, Error };
+    Q_ENUM(Status)
     Status status() const;
 
     bool isNull() const;
@@ -125,7 +125,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QQmlComponent::Status)
 QML_DECLARE_TYPE(QQmlComponent)
 QML_DECLARE_TYPEINFO(QQmlComponent, QML_HAS_ATTACHED_PROPERTIES)
 
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index d035544329..cb9fe9bbef 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -74,10 +74,6 @@ private:
 class Q_AUTOTEST_EXPORT QQmlLocale
 {
     Q_GADGET
-    Q_ENUMS(MeasurementSystem)
-    Q_ENUMS(FormatType)
-    Q_ENUMS(CurrencySymbolFormat)
-    Q_ENUMS(DayOfWeek)
 
 public:
     ~QQmlLocale();
@@ -88,16 +84,19 @@ public:
         ImperialUSSystem = QLocale::ImperialUSSystem,
         ImperialUKSystem = QLocale::ImperialUKSystem
     };
+    Q_ENUM(MeasurementSystem)
     enum FormatType {
         LongFormat = QLocale::LongFormat,
         ShortFormat = QLocale::ShortFormat,
         NarrowFormat = QLocale::NarrowFormat
     };
+    Q_ENUM(FormatType)
     enum CurrencySymbolFormat {
         CurrencyIsoCode = QLocale::CurrencyIsoCode,
         CurrencySymbol = QLocale::CurrencySymbol,
         CurrencyDisplayName = QLocale::CurrencyDisplayName
     };
+    Q_ENUM(CurrencySymbolFormat)
     // Qt defines Sunday as 7, but JS Date assigns Sunday 0
     enum DayOfWeek {
         Sunday = 0,
@@ -108,6 +107,7 @@ public:
         Friday = Qt::Friday,
         Saturday = Qt::Saturday
     };
+    Q_ENUM(DayOfWeek)
 
     static QV4::ReturnedValue locale(QV4::ExecutionEngine *engine, const QString &localeName);
     static QV4::ReturnedValue wrap(QV4::ExecutionEngine *engine, const QLocale &locale);
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index be453ae35a..0dcf78c519 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -191,7 +191,6 @@ struct QQmlEasingValueType
 {
     QEasingCurve v;
     Q_GADGET
-    Q_ENUMS(Type)
 
     Q_PROPERTY(QQmlEasingValueType::Type type READ type WRITE setType FINAL)
     Q_PROPERTY(qreal amplitude READ amplitude WRITE setAmplitude FINAL)
@@ -225,6 +224,7 @@ public:
         SineCurve = QEasingCurve::SineCurve, CosineCurve = QEasingCurve::CosineCurve,
         Bezier = QEasingCurve::BezierSpline
     };
+    Q_ENUM(Type)
 
     Type type() const;
     qreal amplitude() const;