Adapt to the removal of QObject::staticQtMetaObject

Qt::staticMetaObject should be used instead

Change-Id: I1e02884f0b1f07e9c51d065f11bdc51c793b7173
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

6 files changed, 7 insertions, 46 deletions

diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index a5f34dafdf..87f7fffe41 100644
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -108,12 +108,6 @@ void QQmlCustomParser::error(const QV4::CompiledData::Location &location, const
     exceptions << error;
 }
 
-struct StaticQtMetaObject : public QObject
-{
-    static const QMetaObject *get()
-        { return &staticQtMetaObject; }
-};
-
 /*!
     If \a script is a simple enumeration expression (eg. Text.AlignLeft),
     returns the integer equivalent (eg. 1), and sets \a ok to true.
@@ -164,7 +158,7 @@ int QQmlCustomParser::evaluateEnum(const QByteArray& script, bool *ok) const
     }
 
     QByteArray enumValue = script.mid(dot + 1);
-    const QMetaObject *mo = StaticQtMetaObject::get();
+    const QMetaObject *mo = &Qt::staticMetaObject;
     int i = mo->enumeratorCount();
     while (i--) {
         int v = mo->enumerator(i).keyToValue(enumValue.constData(), ok);
diff --git a/src/qml/qml/qqmlmetaobject.cpp b/src/qml/qml/qqmlmetaobject.cpp
index a967f46b12..a87865fd81 100644
--- a/src/qml/qml/qqmlmetaobject.cpp
+++ b/src/qml/qml/qqmlmetaobject.cpp
@@ -44,12 +44,6 @@
 
 QT_BEGIN_NAMESPACE
 
-struct StaticQtMetaObject : public QObject
-{
-    static const QMetaObject *get()
-    { return &staticQtMetaObject; }
-};
-
 static bool isNamedEnumeratorInScope(const QMetaObject *resolvedMetaObject, const QByteArray &scope,
                                      const QByteArray &name)
 {
@@ -74,7 +68,7 @@ static bool isNamedEnumerator(const QMetaObject *metaObj, const QByteArray &scop
     }
 
     if (scope == "Qt")
-        return isNamedEnumeratorInScope(StaticQtMetaObject::get(), scope, name);
+        return isNamedEnumeratorInScope(&Qt::staticMetaObject, scope, name);
 
     if (isNamedEnumeratorInScope(metaObj, scope, name))
         return true;
diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp
index 7b4cf1a580..b4d56c9e49 100644
--- a/src/qml/qml/qqmltypecompiler.cpp
+++ b/src/qml/qml/qqmltypecompiler.cpp
@@ -530,12 +530,6 @@ bool QQmlEnumTypeResolver::resolveEnumBindings()
     return true;
 }
 
-struct StaticQtMetaObject : public QObject
-{
-    static const QMetaObject *get()
-        { return &staticQtMetaObject; }
-};
-
 bool QQmlEnumTypeResolver::assignEnumToBinding(QmlIR::Binding *binding, const QStringRef &enumName, int enumValue, bool isQtObject)
 {
     if (enumName.length() > 0 && enumName[0].isLower() && !isQtObject) {
@@ -626,7 +620,7 @@ bool QQmlEnumTypeResolver::tryQualifiedEnumAssignment(const QmlIR::Object *obj,
                 value = type.enumValue(compiler->enginePrivate(), QHashedStringRef(enumValue), &ok);
         } else {
             QByteArray enumName = enumValue.toUtf8();
-            const QMetaObject *metaObject = StaticQtMetaObject::get();
+            const QMetaObject *metaObject = &Qt::staticMetaObject;
             for (int ii = metaObject->enumeratorCount() - 1; !ok && ii >= 0; --ii) {
                 QMetaEnum e = metaObject->enumerator(ii);
                 value = e.keyToValue(enumName.constData(), &ok);
@@ -655,7 +649,7 @@ int QQmlEnumTypeResolver::evaluateEnum(const QString &scope, const QStringRef &e
         return type.enumValue(compiler->enginePrivate(), QHashedStringRef(enumValue.constData(), enumValue.length()), ok);
     }
 
-    const QMetaObject *mo = StaticQtMetaObject::get();
+    const QMetaObject *mo = &Qt::staticMetaObject;
     int i = mo->enumeratorCount();
     const QByteArray ba = enumValue.toUtf8();
     while (i--) {
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index f5e723419e..2c1956553f 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -93,12 +93,6 @@ DEFINE_OBJECT_VTABLE(QtObject);
         return scope.engine->throwTypeError(QString::fromUtf8(msg)); \
     } while (false)
 
-struct StaticQtMetaObject : public QObject
-{
-    static const QMetaObject *get()
-        { return &staticQtMetaObject; }
-};
-
 void Heap::QtObject::init(QQmlEngine *qmlEngine)
 {
     Heap::Object::init();
@@ -177,7 +171,7 @@ ReturnedValue QtObject::findAndAdd(const QString *name, bool &foundProperty) con
     ScopedString key(scope);
     ScopedValue value(scope);
 
-    const QMetaObject *qtMetaObject = StaticQtMetaObject::get();
+    const QMetaObject *qtMetaObject = &Qt::staticMetaObject;
     for (int enumCount = qtMetaObject->enumeratorCount(); d()->enumeratorIterator < enumCount;
          ++d()->enumeratorIterator) {
         QMetaEnum enumerator = qtMetaObject->enumerator(d()->enumeratorIterator);
diff --git a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
index 1d5611f208..8fa18c9860 100644
--- a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
+++ b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
@@ -1069,12 +1069,6 @@ void tst_qqmlqt::later()
 
 void tst_qqmlqt::qtObjectContents()
 {
-    struct StaticQtMetaObject : public QObject
-    {
-        static const QMetaObject *get()
-        { return &staticQtMetaObject; }
-    };
-
     QQmlComponent component(&engine, testFileUrl("qtObjectContents.qml"));
 
     QScopedPointer<QObject> object(component.create());
@@ -1085,7 +1079,7 @@ void tst_qqmlqt::qtObjectContents()
 
     QSet<const char *> keys;
     int uniqueKeys = 0;
-    const QMetaObject *qtMetaObject = StaticQtMetaObject::get();
+    const QMetaObject *qtMetaObject = &Qt::staticMetaObject;
     for (int ii = 0; ii < qtMetaObject->enumeratorCount(); ++ii) {
         QMetaEnum enumerator = qtMetaObject->enumerator(ii);
         for (int jj = 0; jj < enumerator.keyCount(); ++jj) {
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 1556718471..947b5dff27 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -179,15 +179,6 @@ void collectReachableMetaObjects(QQmlEnginePrivate *engine, const QQmlType &ty,
     }
 }
 
-/* We want to add the MetaObject for 'Qt' to the list, this is a
-   simple way to access it.
-*/
-class FriendlyQObject: public QObject
-{
-public:
-    static const QMetaObject *qtMeta() { return &staticQtMetaObject; }
-};
-
 /* When we dump a QMetaObject, we want to list all the types it is exported as.
    To do this, we need to find the QQmlTypes associated with this
    QMetaObject.
@@ -258,7 +249,7 @@ QSet<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine,
                                                       )
 {
     QSet<const QMetaObject *> metas;
-    metas.insert(FriendlyQObject::qtMeta());
+    metas.insert(&Qt::staticMetaObject);
 
     const auto qmlTypes = QQmlMetaType::qmlTypes();
     for (const QQmlType &ty : qmlTypes) {