diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-30 16:57:19 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-30 17:13:52 +0200 |
| commit | 850f46816fdfaf0948c0e5e3e995c20ef02ca078 (patch) | |
| tree | 5ba0dff999f437db3b482280a17883de55572476 /qtcreator.pro | |
| parent | f9517e04eec12d980a1941b109f8e6127ed0cc17 (diff) | |
Do not use OS scopes in .qmake.cache.
Apparently, that is not allowed in Qt 4 and not recommended in Qt 5.
Change-Id: I4183935d40d1c96c8716562112a31338a2fe57ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 5fc32ced5d..db093aedec 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -45,15 +45,15 @@ exists(src/shared/qbs/qbs.pro) { system("echo QBS_RESOURCES_INSTALL_DIR = $${QTC_PREFIX}/share/qtcreator/qbs >> $$qmake_cache") macx { system("echo QBS_PLUGINS_BUILD_DIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache") + system("echo QBS_APPS_RPATH_DIR = @loader_path/../PlugIns >> $$qmake_cache") } else { system("echo QBS_PLUGINS_BUILD_DIR = $${maybe_backslash}\"$${IDE_BUILD_TREE}/$${IDE_LIBRARY_BASENAME}/qtcreator/$${maybe_backslash}\" >> $$qmake_cache") + system("echo QBS_APPS_RPATH_DIR = '\\\$\\\$ORIGIN/../'/lib/qtcreator >> $$qmake_cache") } 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") } |