qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support 5.x style composite types in qmltypes files 

In Qt6 we don't want those anymore, but it's easy enough to support them
for now.

Task-number: QTBUG-87164
Change-Id: I2a6cd1dd99f772d132f71575c9c5f4538a3dd0f0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann 2020-10-05 17:01:17 +02:00
parent fe013bdbae
commit 889aeb20bd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qmlcompiler/qqmljsimporter.cpp
View File

@ -198,7 +198,7 @@ void QQmlJSImporter::processImport(
for (auto it = import.objects.begin(); it != import.objects.end(); ++it) { for (auto it = import.objects.begin(); it != import.objects.end(); ++it) {
const auto &val = it.value(); 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); val->resolveTypes(types->cppNames);
} }
} }

1
tests/auto/qml/qmllint/data/OldQmltypes/plugins.qmltypes
View File

@ -6,5 +6,6 @@ Module {
prototype: "QQuickItem" prototype: "QQuickItem"
exports: ["OldQmltypes/Frame 1.0"] exports: ["OldQmltypes/Frame 1.0"]
exportMetaObjectRevisions: [0] exportMetaObjectRevisions: [0]
isComposite: true
} }
} }