summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-01-22 17:07:57 +0100
committerTobias Hunger <tobias.hunger@digia.com>2013-01-24 15:11:20 +0100
commit3b72ca6cb0005b68781eedb718ad56a9a069ba56 (patch)
tree9cbef4f6d49aed5f42119c4b938e8dd5a5a5ee0e
parent90b19acccb27b082104ca80d3ec223b76117db4b (diff)
downloadqt-creator-3b72ca6cb0005b68781eedb718ad56a9a069ba56.tar.gz
Use environment variables to look up qbs.
Otherwise most people would have to edit the project file or move their sources and builds around. Change-Id: I9896b983369678921d45657655468711e4c80e73 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanager.pro5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
index 40025e5f40..53fa456cd1 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
@@ -4,6 +4,11 @@ TARGET = QbsProjectManager
include(../../qtcreatorplugin.pri)
include(qbsprojectmanager_dependencies.pri)
+# Look for qbs in the environment...
+isEmpty(QBS_SOURCE_DIR):QBS_SOURCE_DIR=$$(QBS_SOURCE_DIR)
+isEmpty(QBS_BUILD_DIR):QBS_BUILD_DIR=$$(QBS_BUILD_DIR)
+
+# ... otherwise fall back to hard-coded assumptions.
isEmpty(QBS_SOURCE_DIR):QBS_SOURCE_DIR=$$PWD/../../../../qbs
isEmpty(QBS_BUILD_DIR):QBS_BUILD_DIR=$$PWD/../../../../../build/qbs