From 8856066b872d420713e7572ca02cbb7bcd9b69e7 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Thu, 3 Jun 2021 15:37:26 +0200
Subject: [PATCH] QmlDesigner: Treat QtQuick3D 1.15 import as error if
 QtQuick3D 6.0 is available

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>
---
 .../designercore/model/texttomodelmerger.cpp         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index e021f8bd754..198efd918dc 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -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)