diff --git a/src/qmlcompiler/qqmljsimporter.cpp b/src/qmlcompiler/qqmljsimporter.cpp index 94fcdc460c..73d7637d79 100644 --- a/src/qmlcompiler/qqmljsimporter.cpp +++ b/src/qmlcompiler/qqmljsimporter.cpp @@ -198,7 +198,7 @@ void QQmlJSImporter::processImport( for (auto it = import.objects.begin(); it != import.objects.end(); ++it) { const auto &val = it.value(); - if (!val->isComposite()) // Otherwise we have already done it in localFile2ScopeTree() + if (val->baseType().isNull()) // Otherwise we have already done it in localFile2ScopeTree() val->resolveTypes(types->cppNames); } } diff --git a/tests/auto/qml/qmllint/data/OldQmltypes/plugins.qmltypes b/tests/auto/qml/qmllint/data/OldQmltypes/plugins.qmltypes index 71a515d8c5..298eeefff0 100644 --- a/tests/auto/qml/qmllint/data/OldQmltypes/plugins.qmltypes +++ b/tests/auto/qml/qmllint/data/OldQmltypes/plugins.qmltypes @@ -6,5 +6,6 @@ Module { prototype: "QQuickItem" exports: ["OldQmltypes/Frame 1.0"] exportMetaObjectRevisions: [0] + isComposite: true } }