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 /src/qml/qml/qqmlcustomparser.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 'src/qml/qml/qqmlcustomparser.cpp')
-rw-r--r-- | src/qml/qml/qqmlcustomparser.cpp | 8 |
1 files changed, 1 insertions, 7 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); |