diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-04 13:47:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-22 12:16:08 +0000 |
| commit | 9dd84323df5c0ca1f0014d5c95c8771e69d1e9a0 (patch) | |
| tree | 7ff49649ca2b14582f792ba9bf196e6976d1dd11 /qtcreator.pro | |
| parent | d5b4960916d55954c80caf1610387c4efc983ca7 (diff) | |
Use variables for install locations
Define variables in qtcreator.pri for the various
install locations, instead of hardcoding the paths
everywhere where they are needed.
Change-Id: Ia34de711a7f2be317272ede023e2a8b9cdcc30fe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 3078c34be1..941b517ed6 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -38,32 +38,32 @@ exists(src/shared/qbs/qbs.pro) { cache(QBSLIBDIR) QBS_INSTALL_PREFIX = $${QTC_PREFIX} cache(QBS_INSTALL_PREFIX) - QBS_LIB_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator + QBS_LIB_INSTALL_DIR = $$INSTALL_LIBRARY_PATH cache(QBS_LIB_INSTALL_DIR) QBS_RESOURCES_BUILD_DIR = $${IDE_DATA_PATH}/qbs cache(QBS_RESOURCES_BUILD_DIR) - QBS_RESOURCES_INSTALL_DIR = $${QTC_PREFIX}/share/qtcreator/qbs + QBS_RESOURCES_INSTALL_DIR = $$INSTALL_DATA_PATH/qbs cache(QBS_RESOURCES_INSTALL_DIR) macx { QBS_PLUGINS_BUILD_DIR = $${IDE_PLUGIN_PATH} QBS_APPS_RPATH_DIR = @loader_path/../Frameworks } else { - QBS_PLUGINS_BUILD_DIR = $${IDE_BUILD_TREE}/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins + QBS_PLUGINS_BUILD_DIR = $$IDE_PLUGIN_PATH QBS_APPS_RPATH_DIR = \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator } cache(QBS_PLUGINS_BUILD_DIR) cache(QBS_APPS_RPATH_DIR) - QBS_PLUGINS_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins + QBS_PLUGINS_INSTALL_DIR = $$INSTALL_PLUGIN_PATH cache(QBS_PLUGINS_INSTALL_DIR) QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} cache(QBS_LIBRARY_DIRNAME) QBS_APPS_DESTDIR = $${IDE_BIN_PATH} cache(QBS_APPS_DESTDIR) - QBS_APPS_INSTALL_DIR = $${QTC_PREFIX}/bin + QBS_APPS_INSTALL_DIR = $$INSTALL_BIN_PATH cache(QBS_APPS_INSTALL_DIR) QBS_LIBEXEC_DESTDIR = $${IDE_LIBEXEC_PATH} cache(QBS_LIBEXEC_DESTDIR) - QBS_LIBEXEC_INSTALL_DIR = $${QTC_PREFIX}/bin + QBS_LIBEXEC_INSTALL_DIR = $$INSTALL_LIBEXEC_PATH 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 = . |