Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

1 files changed, 1 insertions, 10 deletions

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) {