From 1d11fd734469c745e55409d25e447584e9f6390f Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Tue, 1 Oct 2013 10:33:41 +0200
Subject: [PATCH] qbs project: Add properties for pulling in additional
resources.
We need this to build plugins located outside the source tree.
Change-Id: Ie587b5e838bf0ce67b19d3222bbc40b53b888e69
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
qtcreator.qbs | 3 +++
src/libs/libs.qbs | 2 +-
src/plugins/plugins.qbs | 2 +-
src/tools/tools.qbs | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 3e1d8429008..eb204c8f7c7 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -13,6 +13,9 @@ Project {
property path ide_source_tree: path
property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
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: {
if (qbs.targetOS.contains("osx"))
return ide_app_target + ".app/Contents/PlugIns"
diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs
index d7ca88dd113..f6f2a369594 100644
--- a/src/libs/libs.qbs
+++ b/src/libs/libs.qbs
@@ -17,5 +17,5 @@ Project {
"utils/process_ctrlc_stub.qbs",
"utils/utils.qbs",
"zeroconf/zeroconf.qbs",
- ]
+ ].concat(project.additionalLibs)
}
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
index 3981b5be54a..0d276cf5b4b 100644
--- a/src/plugins/plugins.qbs
+++ b/src/plugins/plugins.qbs
@@ -59,5 +59,5 @@ Project {
"valgrind/valgrind.qbs",
"vcsbase/vcsbase.qbs",
"welcome/welcome.qbs"
- ]
+ ].concat(project.additionalPlugins)
}
diff --git a/src/tools/tools.qbs b/src/tools/tools.qbs
index 74b476f52ac..13888afadae 100644
--- a/src/tools/tools.qbs
+++ b/src/tools/tools.qbs
@@ -8,5 +8,5 @@ Project {
"qtpromaker/qtpromaker.qbs",
"sdktool/sdktool.qbs",
"valgrindfake/valgrindfake.qbs"
- ]
+ ].concat(project.additionalTools)
}
--
GitLab