Fix qbs build.

Commit cf56178d introduced an impressive amount of syntax errors.

Change-Id: Ibaf8b8384b06ee92b658b71f08ac8d14e92c19b0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2013-09-16 17:17:27 +02:00
committed by Joerg Bornemann
parent 5ed046f1c1
commit 3ae8d6b36a
4 changed files with 13 additions and 15 deletions

View File

@@ -2,6 +2,7 @@ import qbs
Project { Project {
name: "Plugins" name: "Plugins"
property bool buildWelcomePlugin: Qt.core.versionMajor >= 5
references: [ references: [
"analyzerbase/analyzerbase.qbs", "analyzerbase/analyzerbase.qbs",
@@ -57,11 +58,6 @@ Project {
"updateinfo/updateinfo.qbs", "updateinfo/updateinfo.qbs",
"valgrind/valgrind.qbs", "valgrind/valgrind.qbs",
"vcsbase/vcsbase.qbs", "vcsbase/vcsbase.qbs",
"welcome/welcome.qbs"
] ]
Group {
condition: qtcore.versionMajor >= 5
references: [ "welcome/welcome.qbs" ]
}
} }

View File

@@ -135,15 +135,15 @@ QtcPlugin {
"toolchainoptionspage.cpp", "toolchainoptionspage.h", "toolchainoptionspage.cpp", "toolchainoptionspage.h",
"vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h", "vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h",
] ]
}
Group { Group {
condition: qtcore.versionMajor >= 5 name: "Project Welcome Page"
references: [ condition: project.buildWelcomePlugin
"projectwelcomepage.cpp", files: [
"projectwelcomepage.h" "projectwelcomepage.cpp",
] "projectwelcomepage.h"
} ]
} }
Group { Group {

View File

@@ -111,7 +111,8 @@ QtcPlugin {
] ]
Group { Group {
condition: qtcore.versionMajor >= 5 name: "Getting Started Welcome Page"
condition: project.buildWelcomePlugin
files: [ files: [
"gettingstartedwelcomepage.cpp", "gettingstartedwelcomepage.cpp",
"gettingstartedwelcomepage.h" "gettingstartedwelcomepage.h"

View File

@@ -4,6 +4,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "Welcome" name: "Welcome"
condition: project.buildWelcomePlugin
Depends { name: "Qt"; submodules: ["widgets", "network", "quick"] } Depends { name: "Qt"; submodules: ["widgets", "network", "quick"] }
Depends { name: "Core" } Depends { name: "Core" }