feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Treat QtQuick3D 1.15 import as error if QtQuick3D 6.0 is available

Browse Source 
If QtQuick3D 6.0 we have a Qt 6 kit and QtQuick3D 1.15 should be treated as
an error.

Change-Id: Ia7e7cbb927147557a10fe18eb2ce94b7d23803bc
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Thomas Hartmann
2021-06-03 15:37:26 +02:00
parent 6886142306
commit 8856066b87
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -2138,6 +2138,18 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage>
if (message.severity == Severity::Warning)
warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl));
}
for (const Import &import : m_rewriterView->model()->imports()) {
if (import.isLibraryImport() && import.url() == "QtQuick3D") {
const QString version = getHighestPossibleImport(import.url());
if (Import::majorFromVersion(version) > import.majorVersion()) {
errors->append(DocumentMessage(
QObject::tr(
"The selected version of the Qt Quick 3D module is not supported with the selected Qt version.")
.arg(version)));
}
}
}
}
void TextToModelMerger::populateQrcMapping(const QString &filePath)