qbs build: Require Qt 6.2 for QmlDesigner

As in the cmake build.

Change-Id: Iedd7032093682e7cf6f423909724201f6c5840d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-06-10 12:28:49 +02:00
parent a760d5ad81
commit 9a411245d3
6 changed files with 14 additions and 10 deletions

View File

@@ -2,13 +2,14 @@ import qbs
QtcProduct {
name: "assetexporterplugin"
condition: QmlDesigner.present
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlDesigner" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "Utils" }
Depends {
name: "Qt"

View File

@@ -2,12 +2,13 @@ import qbs
QtcProduct {
name: "componentsplugin"
condition: QmlDesigner.present
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
Depends { name: "Core" }
Depends { name: "QmlDesigner" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "Utils" }
Depends { name: "Qt.qml" }

View File

@@ -5,13 +5,12 @@ Project {
name: "QmlDesigner"
QtcPlugin {
condition: Qt.quickwidgets.present && Qt.svg.present
fileName: FileInfo.fileName(filePath)
Depends {
name: "Qt";
submodules: [
"core-private", "quickwidgets", "xml", "svg"
]
name: "Qt"; versionAtLeast: "6.2"; required: false
submodules: ["core-private", "quickwidgets", "xml", "svg"]
}
Depends { name: "AdvancedDockingSystem" }
Depends { name: "Core" }

View File

@@ -2,6 +2,7 @@ import qbs
QtcProduct {
name: "qmlpreviewplugin"
condition: QmlDesigner.present
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
@@ -15,7 +16,7 @@ QtcProduct {
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlDesigner" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "Qt.qml" }
Depends { name: "Utils" }

View File

@@ -2,6 +2,7 @@ import qbs.FileInfo
QtcPlugin {
name: "StudioWelcome"
condition: QmlDesigner.present
Depends { name: "Qt"; submodules: ["qml", "qml-private", "quick", "quickwidgets"] }
Depends { name: "Utils" }
@@ -9,7 +10,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
Depends { name: "QmlDesigner" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "QmlProjectManager" }
Depends { name: "app_version_header" }

View File

@@ -6,7 +6,8 @@ Project {
QtcProduct {
name: "Unit test"
condition: qtc_gtest_gmock.hasRepo || qtc_gtest_gmock.externalLibsPresent
condition: (qtc_gtest_gmock.hasRepo || qtc_gtest_gmock.externalLibsPresent)
&& QmlDesigner.present
type: ["application", "autotest"]
consoleApplication: true
@@ -17,7 +18,7 @@ Project {
Depends { name: "libclang"; required: false }
Depends { name: "clang_defines" }
Depends { name: "QmlDesigner" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "sqlite_sources" }
Depends { name: "Core" }