diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs index 031b0977bc5..a8bc03685f3 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs @@ -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" diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs index 84adc2b5304..520e533af5b 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs @@ -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" } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 0ea3b5008a1..7b8ef977751 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -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" } diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.qbs b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.qbs index 8e48e6aa850..05e809d4331 100644 --- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.qbs +++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.qbs @@ -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" } diff --git a/src/plugins/studiowelcome/studiowelcome.qbs b/src/plugins/studiowelcome/studiowelcome.qbs index 4c82c8112ec..7d254824ba5 100644 --- a/src/plugins/studiowelcome/studiowelcome.qbs +++ b/src/plugins/studiowelcome/studiowelcome.qbs @@ -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" } diff --git a/tests/unit/unittest/unittest.qbs b/tests/unit/unittest/unittest.qbs index 00f3e2a8c64..3828063b783 100644 --- a/tests/unit/unittest/unittest.qbs +++ b/tests/unit/unittest/unittest.qbs @@ -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" }