forked from qt-creator/qt-creator
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:
@@ -2,13 +2,14 @@ import qbs
|
|||||||
|
|
||||||
QtcProduct {
|
QtcProduct {
|
||||||
name: "assetexporterplugin"
|
name: "assetexporterplugin"
|
||||||
|
condition: QmlDesigner.present
|
||||||
type: ["dynamiclibrary"]
|
type: ["dynamiclibrary"]
|
||||||
installDir: qtc.ide_plugin_path + '/' + installDirName
|
installDir: qtc.ide_plugin_path + '/' + installDirName
|
||||||
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
|
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
|
||||||
|
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "ProjectExplorer" }
|
Depends { name: "ProjectExplorer" }
|
||||||
Depends { name: "QmlDesigner" }
|
Depends { name: "QmlDesigner"; required: false }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
Depends {
|
Depends {
|
||||||
name: "Qt"
|
name: "Qt"
|
||||||
|
@@ -2,12 +2,13 @@ import qbs
|
|||||||
|
|
||||||
QtcProduct {
|
QtcProduct {
|
||||||
name: "componentsplugin"
|
name: "componentsplugin"
|
||||||
|
condition: QmlDesigner.present
|
||||||
type: ["dynamiclibrary"]
|
type: ["dynamiclibrary"]
|
||||||
installDir: qtc.ide_plugin_path + '/' + installDirName
|
installDir: qtc.ide_plugin_path + '/' + installDirName
|
||||||
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
|
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
|
||||||
|
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "QmlDesigner" }
|
Depends { name: "QmlDesigner"; required: false }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
Depends { name: "Qt.qml" }
|
Depends { name: "Qt.qml" }
|
||||||
|
|
||||||
|
@@ -5,13 +5,12 @@ Project {
|
|||||||
name: "QmlDesigner"
|
name: "QmlDesigner"
|
||||||
|
|
||||||
QtcPlugin {
|
QtcPlugin {
|
||||||
|
condition: Qt.quickwidgets.present && Qt.svg.present
|
||||||
fileName: FileInfo.fileName(filePath)
|
fileName: FileInfo.fileName(filePath)
|
||||||
|
|
||||||
Depends {
|
Depends {
|
||||||
name: "Qt";
|
name: "Qt"; versionAtLeast: "6.2"; required: false
|
||||||
submodules: [
|
submodules: ["core-private", "quickwidgets", "xml", "svg"]
|
||||||
"core-private", "quickwidgets", "xml", "svg"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
Depends { name: "AdvancedDockingSystem" }
|
Depends { name: "AdvancedDockingSystem" }
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
|
@@ -2,6 +2,7 @@ import qbs
|
|||||||
|
|
||||||
QtcProduct {
|
QtcProduct {
|
||||||
name: "qmlpreviewplugin"
|
name: "qmlpreviewplugin"
|
||||||
|
condition: QmlDesigner.present
|
||||||
type: ["dynamiclibrary"]
|
type: ["dynamiclibrary"]
|
||||||
installDir: qtc.ide_plugin_path + '/' + installDirName
|
installDir: qtc.ide_plugin_path + '/' + installDirName
|
||||||
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
|
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
|
||||||
@@ -15,7 +16,7 @@ QtcProduct {
|
|||||||
|
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "ProjectExplorer" }
|
Depends { name: "ProjectExplorer" }
|
||||||
Depends { name: "QmlDesigner" }
|
Depends { name: "QmlDesigner"; required: false }
|
||||||
Depends { name: "Qt.qml" }
|
Depends { name: "Qt.qml" }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
|
|
||||||
|
@@ -2,6 +2,7 @@ import qbs.FileInfo
|
|||||||
|
|
||||||
QtcPlugin {
|
QtcPlugin {
|
||||||
name: "StudioWelcome"
|
name: "StudioWelcome"
|
||||||
|
condition: QmlDesigner.present
|
||||||
|
|
||||||
Depends { name: "Qt"; submodules: ["qml", "qml-private", "quick", "quickwidgets"] }
|
Depends { name: "Qt"; submodules: ["qml", "qml-private", "quick", "quickwidgets"] }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
@@ -9,7 +10,7 @@ QtcPlugin {
|
|||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "ProjectExplorer" }
|
Depends { name: "ProjectExplorer" }
|
||||||
Depends { name: "QtSupport" }
|
Depends { name: "QtSupport" }
|
||||||
Depends { name: "QmlDesigner" }
|
Depends { name: "QmlDesigner"; required: false }
|
||||||
Depends { name: "QmlProjectManager" }
|
Depends { name: "QmlProjectManager" }
|
||||||
Depends { name: "app_version_header" }
|
Depends { name: "app_version_header" }
|
||||||
|
|
||||||
|
@@ -6,7 +6,8 @@ Project {
|
|||||||
|
|
||||||
QtcProduct {
|
QtcProduct {
|
||||||
name: "Unit test"
|
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"]
|
type: ["application", "autotest"]
|
||||||
consoleApplication: true
|
consoleApplication: true
|
||||||
@@ -17,7 +18,7 @@ Project {
|
|||||||
Depends { name: "libclang"; required: false }
|
Depends { name: "libclang"; required: false }
|
||||||
Depends { name: "clang_defines" }
|
Depends { name: "clang_defines" }
|
||||||
|
|
||||||
Depends { name: "QmlDesigner" }
|
Depends { name: "QmlDesigner"; required: false }
|
||||||
|
|
||||||
Depends { name: "sqlite_sources" }
|
Depends { name: "sqlite_sources" }
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
|
Reference in New Issue
Block a user