From 01302a49dfa616c227f9334b2f5469b43c60b328 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 23 Apr 2014 12:03:29 +0200 Subject: When the qbs submodule is present, build its applications too. So far, we have only built the library, arguing that that's all QtC needs from qbs. However, it turns out that it is useful to have the qbs executable as well, e.g. if there is a problem and the user wants to quickly compare the behavior of QtC and the command line tool with the guarantee that they're using the exact same qbs library. Task-number: QBS-558 Change-Id: Iddf94a0b304467abee313bcd52e446f02156c98b Reviewed-by: Joerg Bornemann --- qtcreator.pro | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qtcreator.pro') diff --git a/qtcreator.pro b/qtcreator.pro index 8e3676ab14..5fc32ced5d 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -50,6 +50,10 @@ exists(src/shared/qbs/qbs.pro) { } system("echo QBS_PLUGINS_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator >> $$qmake_cache") system("echo QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} >> $$qmake_cache") + system("echo QBS_APPS_DESTDIR = $${IDE_BIN_PATH} >> $$qmake_cache") + system("echo QBS_APPS_INSTALL_DIR = $${QTC_PREFIX}/bin >> $$qmake_cache") + system("echo macx:QBS_APPS_RPATH_DIR = @loader_path/../PlugIns >> $$qmake_cache") + system("echo else:QBS_APPS_RPATH_DIR = '\\\$\\\$ORIGIN/../'/lib/qtcreator >> $$qmake_cache") system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache") } -- cgit v1.2.1