From 39a81a7baa1fc2601f7ac3b9cc0ef6142115d71e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 23 Mar 2022 10:53:22 +0100 Subject: [PATCH] QmlDesigner: Force QtQuick.Studio.x components to use version 1.0 With the latest chages and switching to cmake the version is actually 6.x, but 1.0 is also supported and this will keep projects backwards compatible. Change-Id: Id3d77b323f008ca20bd276859d5a4a573663120c Reviewed-by: Reviewed-by: Thomas Hartmann --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index d9c369e3dd8..ad3c1693304 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -958,6 +958,12 @@ static QList generatePossibleLibraryImports(const QHash= 0) { int minorVersion = (importKey.minorVersion == LanguageUtils::ComponentVersion::NoVersion) ? 0 : importKey.minorVersion; + + if (libraryName.contains("QtQuick.Studio")) { + majorVersion = 1; + minorVersion = 0; + } + QString version = QStringLiteral("%1.%2").arg(majorVersion).arg(minorVersion); if (!libraryName.endsWith(".impl")) possibleImports.append(QmlDesigner::Import::createLibraryImport(libraryName, version));