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

qbs project: Add properties for pulling in additional resources.

Browse Source 
We need this to build plugins located outside the source tree.

Change-Id: Ie587b5e838bf0ce67b19d3222bbc40b53b888e69
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2013-10-01 10:33:41 +02:00
committed by Joerg Bornemann
parent 7b2c26204a
commit 1d11fd7344
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qtcreator.qbs
View File

@@ -13,6 +13,9 @@ Project {
property path ide_source_tree: path property path ide_source_tree: path
property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin" property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator" property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator"
property pathList additionalPlugins: []
property pathList additionalLibs: []
property pathList additionalTools: []
property string ide_library_path: { property string ide_library_path: {
if (qbs.targetOS.contains("osx")) if (qbs.targetOS.contains("osx"))
return ide_app_target + ".app/Contents/PlugIns" return ide_app_target + ".app/Contents/PlugIns"

2
src/libs/libs.qbs
View File

@@ -17,5 +17,5 @@ Project {
"utils/process_ctrlc_stub.qbs", "utils/process_ctrlc_stub.qbs",
"utils/utils.qbs", "utils/utils.qbs",
"zeroconf/zeroconf.qbs", "zeroconf/zeroconf.qbs",
] ].concat(project.additionalLibs)
} }

2
src/plugins/plugins.qbs
View File

@@ -59,5 +59,5 @@ Project {
"valgrind/valgrind.qbs", "valgrind/valgrind.qbs",
"vcsbase/vcsbase.qbs", "vcsbase/vcsbase.qbs",
"welcome/welcome.qbs" "welcome/welcome.qbs"
] ].concat(project.additionalPlugins)
} }

2
src/tools/tools.qbs
View File

@@ -8,5 +8,5 @@ Project {
"qtpromaker/qtpromaker.qbs", "qtpromaker/qtpromaker.qbs",
"sdktool/sdktool.qbs", "sdktool/sdktool.qbs",
"valgrindfake/valgrindfake.qbs" "valgrindfake/valgrindfake.qbs"
] ].concat(project.additionalTools)
} }