diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-17 12:04:21 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-17 12:04:21 +0200 |
| commit | 4dd95aa5d4fd349e4cb9dceb5c35b55cdbe5bc13 (patch) | |
| tree | 4f6d55002a3cf98a9c2d6771401dc066ed0527e9 /qtcreator.pro | |
| parent | bea726e8e2948b1ccfe2b94e6dd0ac0c81957d9e (diff) | |
| parent | 50c6343615e12398524d1a126fb19d6b8934337a (diff) | |
Merge remote-tracking branch 'origin/3.4'
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index c4edd258a8..c78f6bec4f 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -61,6 +61,13 @@ exists(src/shared/qbs/qbs.pro) { cache(QBS_APPS_DESTDIR) QBS_APPS_INSTALL_DIR = $${QTC_PREFIX}/bin cache(QBS_APPS_INSTALL_DIR) + QBS_LIBEXEC_DESTDIR = $${IDE_LIBEXEC_PATH} + cache(QBS_LIBEXEC_DESTDIR) + QBS_LIBEXEC_INSTALL_DIR = $${QTC_PREFIX}/bin + cache(QBS_LIBEXEC_INSTALL_DIR) + QBS_RELATIVE_LIBEXEC_PATH = $$relative_path($$QBS_LIBEXEC_DESTDIR, $$QBS_APPS_DESTDIR) + isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH = . + cache(QBS_RELATIVE_LIBEXEC_PATH) QBS_RELATIVE_PLUGINS_PATH = $$relative_path($$QBS_PLUGINS_BUILD_DIR, $$QBS_APPS_DESTDIR$$) cache(QBS_RELATIVE_PLUGINS_PATH) QBS_RELATIVE_SEARCH_PATH = $$relative_path($$QBS_RESOURCES_BUILD_DIR, $$QBS_APPS_DESTDIR) |