From 3e6fcd6063157dfda5ec49bd924b749de932cf18 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 6 Sep 2013 14:39:11 +0200 Subject: 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 --- src/src.qbs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/src.qbs') 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" -- cgit v1.2.1