Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly

Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index cc6e75a39c..5cf87f5264 100644
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -138,7 +138,7 @@ int QQmlCustomParser::evaluateEnum(const QByteArray& script, bool *ok) const
         QQmlType type;
 
         if (imports.isT1()) {
-            imports.asT1()->resolveType(scope, &type, 0, 0, 0);
+            imports.asT1()->resolveType(scope, &type, nullptr, nullptr, nullptr);
         } else {
             QQmlTypeNameCache::Result result = imports.asT2()->query(scope);
             if (result.isValid())
@@ -178,7 +178,7 @@ const QMetaObject *QQmlCustomParser::resolveType(const QString& name) const
     if (!imports.isT1())
         return nullptr;
     QQmlType qmltype;
-    if (!imports.asT1()->resolveType(name, &qmltype, 0, 0, 0))
+    if (!imports.asT1()->resolveType(name, &qmltype, nullptr, nullptr, nullptr))
         return nullptr;
     return qmltype.metaObject();
 }