diff options
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
-rw-r--r-- | src/qml/qml/qqmlimport.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 906e073cab..5a54609e12 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -653,9 +653,10 @@ bool QQmlImportNamespace::Import::resolveType(QQmlTypeLoader *typeLoader, } if (candidate != end) { + QQmlType *returnType = getTypeForUrl(componentUrl, type, isCompositeSingleton, 0); if (type_return) - *type_return = getTypeForUrl(componentUrl, type, isCompositeSingleton, 0); - return (*type_return != 0); + *type_return = returnType; + return returnType != 0; } } else if (!isLibrary) { QString qmlUrl; @@ -679,9 +680,10 @@ bool QQmlImportNamespace::Import::resolveType(QQmlTypeLoader *typeLoader, if (typeRecursionDetected) *typeRecursionDetected = true; } else { + QQmlType *returnType = getTypeForUrl(qmlUrl, type, false, 0); if (type_return) - *type_return = getTypeForUrl(qmlUrl, type, false, 0); - return (*type_return) != 0; + *type_return = returnType; + return returnType != 0; } } } |