aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlplugindump
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2019-12-10 15:26:18 +0100
committerUlf Hermann <ulf.hermann@qt.io>2020-01-14 14:53:56 +0100
commit82030ac616821b6ec614112b74e6e2f46b808c17 (patch)
treee393ef4b397b45a9252bd71efb26bff2d99db5aa /tools/qmlplugindump
parented721c28728c1e88f8e9667a2e0eac755e1d572a (diff)
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>
Diffstat (limited to 'tools/qmlplugindump')
-rw-r--r--tools/qmlplugindump/main.cpp11
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) {