feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

introduce buildQbsProjectManager property

Browse Source 
this will centralize some conditionals further down the line

Change-Id: I53b26cc29ac3fa098a583d6ac4d28924e5a1f2a3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Oswald Buddenhagen
2013-08-21 16:30:07 +02:00
committed by Christian Kandeler
parent 95859289b8
commit 95c943a8d6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
View File

@@ -26,7 +26,7 @@ QtcPlugin {
return libs return libs
} }
condition: project.useExternalQbs || project.qbsSubModuleExists condition: project.buildQbsProjectManager
Depends { name: "Qt"; submodules: [ "widgets", "script" ] } Depends { name: "Qt"; submodules: [ "widgets", "script" ] }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }

1
src/src.qbs
View File

@@ -15,6 +15,7 @@ Project {
property path qbs_build_dir: qbs.getenv("QBS_BUILD_DIR") property path qbs_build_dir: qbs.getenv("QBS_BUILD_DIR")
property path qbs_source_dir: qbs.getenv("QBS_SOURCE_DIR") property path qbs_source_dir: qbs.getenv("QBS_SOURCE_DIR")
property bool useExternalQbs: qbs_build_dir && qbs_source_dir property bool useExternalQbs: qbs_build_dir && qbs_source_dir
property bool buildQbsProjectManager: useExternalQbs || qbsSubModuleExists
Project { Project {
name: "qbs" name: "qbs"
id: qbsProject id: qbsProject