diff options
| -rw-r--r-- | src/plugins/plugins.qbs | 8 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.qbs | 16 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtsupport.qbs | 3 | ||||
| -rw-r--r-- | src/plugins/welcome/welcome.qbs | 1 |
4 files changed, 13 insertions, 15 deletions
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs index 7c49ff9e2f3..bad272f20d9 100644 --- a/src/plugins/plugins.qbs +++ b/src/plugins/plugins.qbs @@ -2,6 +2,7 @@ import qbs Project { name: "Plugins" + property bool buildWelcomePlugin: Qt.core.versionMajor >= 5 references: [ "analyzerbase/analyzerbase.qbs", @@ -57,11 +58,6 @@ Project { "updateinfo/updateinfo.qbs", "valgrind/valgrind.qbs", "vcsbase/vcsbase.qbs", + "welcome/welcome.qbs" ] - - Group { - condition: qtcore.versionMajor >= 5 - references: [ "welcome/welcome.qbs" ] - } - } diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 3faba5ea1aa..410a0f10859 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -135,15 +135,15 @@ QtcPlugin { "toolchainoptionspage.cpp", "toolchainoptionspage.h", "vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h", ] + } - Group { - condition: qtcore.versionMajor >= 5 - references: [ - "projectwelcomepage.cpp", - "projectwelcomepage.h" - ] - } - + Group { + name: "Project Welcome Page" + condition: project.buildWelcomePlugin + files: [ + "projectwelcomepage.cpp", + "projectwelcomepage.h" + ] } Group { diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index 74924118c0e..a243b52e5a8 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -111,7 +111,8 @@ QtcPlugin { ] Group { - condition: qtcore.versionMajor >= 5 + name: "Getting Started Welcome Page" + condition: project.buildWelcomePlugin files: [ "gettingstartedwelcomepage.cpp", "gettingstartedwelcomepage.h" diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs index 93ca3f4e61b..4d88c72f1ea 100644 --- a/src/plugins/welcome/welcome.qbs +++ b/src/plugins/welcome/welcome.qbs @@ -4,6 +4,7 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "Welcome" + condition: project.buildWelcomePlugin Depends { name: "Qt"; submodules: ["widgets", "network", "quick"] } Depends { name: "Core" } |