diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-10-06 15:24:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-10-06 15:33:48 +0200 |
| commit | 580b5d12398a9a3e67e63a3c27c70d48f4d1ed75 (patch) | |
| tree | 6da4fa35011468d7057efcea446da94e3621ea87 | |
| parent | eb2bfc3b4ace7a85036af20be6ff9324b3b03c10 (diff) | |
Don't build qbs sbubmodule if installed qbs is provided.
We want to build against that one then.
Change-Id: Iab6aaec4872ec02735292f2d8b3507fcbf3140ea
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/src.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 06fec5ded6..f64dc04821 100644 --- a/src/src.pro +++ b/src/src.pro @@ -18,7 +18,10 @@ qbsapps.depends = qbsqtprofilesetup qbsplugins.subdir = shared/qbs/src/plugins qbsstatic.file = shared/qbs/static.pro -exists(shared/qbs/qbs.pro): SUBDIRS += $$QBS_DIRS +exists(shared/qbs/qbs.pro) { + isEmpty(QBS_INSTALL_DIR):QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) + isEmpty(QBS_INSTALL_DIR):SUBDIRS += $$QBS_DIRS +} TR_EXCLUDE = $$QBS_DIRS SUBDIRS += \ |