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/plugins/plugins.pro | |
| parent | a8d7e15a5dd88f2c7f34e03ca8594d584ac15bc0 (diff) | |
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/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 56194aa4758..592481aac10 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -49,7 +49,8 @@ SUBDIRS = \ qnx \ clearcase -exists(../shared/qbs/qbs.pro): \ +isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) +exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \ SUBDIRS += \ qbsprojectmanager |