diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-15 16:00:39 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-17 04:03:21 +0000 |
commit | 88af61180be2636e9b2f0714bed448d7d9270adc (patch) | |
tree | 557f496bea2f8cb77f4946623b0b97d7d7ed26c6 /src/qml/qml/qqmlcustomparser.cpp | |
parent | 2997b7ea99906801c9cb92a7e095c8044c86dc0a (diff) |
Minor QQmlPropertyValidator/QQmlCustomParser cleanup
The QQmlCustomParser already has an imports bi-pointer, so there's no
need for the property validator to implement an interface anymore.
Change-Id: Iabe9810ff26afdbc0c51efde3b20383c8f4f2348
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlcustomparser.cpp')
-rw-r--r-- | src/qml/qml/qqmlcustomparser.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp index e9f747a440..30eed4d551 100644 --- a/src/qml/qml/qqmlcustomparser.cpp +++ b/src/qml/qml/qqmlcustomparser.cpp @@ -165,11 +165,13 @@ int QQmlCustomParser::evaluateEnum(const QByteArray& script, bool *ok) const */ const QMetaObject *QQmlCustomParser::resolveType(const QString& name) const { + if (!imports.isT1()) + return nullptr; QQmlType *qmltype = 0; - if (!validator->imports().resolveType(name, &qmltype, 0, 0, 0)) - return 0; + if (!imports.asT1()->resolveType(name, &qmltype, 0, 0, 0)) + return nullptr; if (!qmltype) - return 0; + return nullptr; return qmltype->metaObject(); } |