diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-09-17 18:15:59 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-09-19 13:27:55 +0200 |
| commit | 7e9a4131413e05b365c066a5476dc39f43935914 (patch) | |
| tree | afb352bcafc8a37c4395e3f2baeecb75876a74ec /src/plugins/qtsupport/qtsupport.qbs | |
| parent | 2167788b3d9900e0eeded901ac30cd978f595c1b (diff) | |
Fix qbs build.
There was more stuff broken by the switch to Qt Quick 2 than were
originally noticed, and the original fix was buggy as well.
Change-Id: I2b3e0619af923c52aba809355ac271b67097adf1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins/qtsupport/qtsupport.qbs')
| -rw-r--r-- | src/plugins/qtsupport/qtsupport.qbs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index a243b52e5a..8f88499c73 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -1,11 +1,13 @@ import qbs.base 1.0 +import "../../../qbs/defaults.js" as Defaults import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "QtSupport" - Depends { name: "Qt"; submodules: ["widgets", "quick"] } + Depends { name: "Qt"; submodules: ["core", "widgets"]; } + Depends { name: "Qt.quick"; condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1"); } Depends { name: "Core" } Depends { name: "ProjectExplorer" } Depends { name: "TextEditor" } @@ -112,7 +114,7 @@ QtcPlugin { Group { name: "Getting Started Welcome Page" - condition: project.buildWelcomePlugin + condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1") files: [ "gettingstartedwelcomepage.cpp", "gettingstartedwelcomepage.h" |