diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2019-12-10 15:26:18 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-14 14:53:56 +0100 |
| commit | 82030ac616821b6ec614112b74e6e2f46b808c17 (patch) | |
| tree | e393ef4b397b45a9252bd71efb26bff2d99db5aa /tests/auto/qml/qqmlqt/tst_qqmlqt.cpp | |
| parent | ed721c28728c1e88f8e9667a2e0eac755e1d572a (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 'tests/auto/qml/qqmlqt/tst_qqmlqt.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlqt/tst_qqmlqt.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
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) { |