diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-09-06 14:39:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-09-11 12:01:04 +0200 |
| commit | 3e6fcd6063157dfda5ec49bd924b749de932cf18 (patch) | |
| tree | fb7d6e4ebcbdd38864eba3ba5566e7b6bfa4aada /src/src.qbs | |
| parent | a8d7e15a5dd88f2c7f34e03ca8594d584ac15bc0 (diff) | |
| download | qt-creator-3e6fcd6063157dfda5ec49bd924b749de932cf18.tar.gz | |
QbsProjectManager: Support using an installed qbs.
Distributions will want to make Creator work with
their qbs package instead of adding it a second time
via the submodule, so we support that by checking for
the QBS_INSTALL_DIR environment variable.
This supersedes the current mechanism using QBS_SOURCE_DIR
and QBS_BUILD_DIR.
Change-Id: I2cff651cd23ea47b1a1434e33f80cb74ca0fc96b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/src.qbs')
| -rw-r--r-- | src/src.qbs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/src.qbs b/src/src.qbs index 1a9c26b43f..11853ff7c5 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -12,9 +12,8 @@ Project { ] property bool qbsSubModuleExists: File.exists(qbsProject.qbsBaseDir + "/qbs.qbs") - property path qbs_build_dir: qbs.getenv("QBS_BUILD_DIR") - property path qbs_source_dir: qbs.getenv("QBS_SOURCE_DIR") - property bool useExternalQbs: qbs_build_dir && qbs_source_dir + property path qbs_install_dir: qbs.getenv("QBS_INSTALL_DIR") + property bool useExternalQbs: qbs_install_dir property bool buildQbsProjectManager: useExternalQbs || qbsSubModuleExists Project { name: "qbs" |