diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-20 13:03:15 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-24 16:39:24 +0200 |
commit | 9b9814fd7209c3e06ae3481c210fbc60e0e179e6 (patch) | |
tree | 1649e618ac1a8a8df2801bf36d5cc5b8c8614927 /qtcreator.pro | |
parent | d17157f83a98d949beec849df584dd3233187ea4 (diff) |
Fix default search and plugin path for qbs.
That is, the qbs command-line frontend that we build.
Task-number: QTCREATORBUG-12474
Change-Id: Ia21c24daa25fff5ffe2fe69d23bd6d30285eec9a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'qtcreator.pro')
-rw-r--r-- | qtcreator.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 229d97e856..702b46ae18 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -54,6 +54,8 @@ exists(src/shared/qbs/qbs.pro) { system("echo QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} >> $$qmake_cache") system("echo QBS_APPS_DESTDIR = $${maybe_backslash}\"$${IDE_BIN_PATH}$${maybe_backslash}\">> $$qmake_cache") system("echo QBS_APPS_INSTALL_DIR = $${QTC_PREFIX}/bin >> $$qmake_cache") + system("echo QBS_RELATIVE_PLUGINS_PATH = $${maybe_backslash}\$$${maybe_backslash}\$relative_path$${maybe_backslash}\($${maybe_backslash}\$$${maybe_backslash}\$QBS_PLUGINS_BUILD_DIR, $${maybe_backslash}\$$${maybe_backslash}\$QBS_APPS_DESTDIR$${maybe_backslash}\)" >> $$qmake_cache) + system("echo QBS_RELATIVE_SEARCH_PATH = $${maybe_backslash}\$$${maybe_backslash}\$relative_path$${maybe_backslash}\($${maybe_backslash}\$$${maybe_backslash}\$QBS_RESOURCES_BUILD_DIR, $${maybe_backslash}\$$${maybe_backslash}\$QBS_APPS_DESTDIR$${maybe_backslash}\)" >> $$qmake_cache) system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache") } |