diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-08-26 13:26:21 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-02 09:24:10 +0200 |
| commit | deea0022f7ea1bdc48ceafe57c2dfbfd848ac8a8 (patch) | |
| tree | 6967b3292eea3db70ad282af9ef581c6e1bfbcf0 /qtcreator.pro | |
| parent | fcf5c0ea202105ed17e1bc321993c5a3bc72d546 (diff) | |
Fix library and plugin paths
OSX: Move libraries from PlugIns/ to Frameworks/
other: move QmlDesigner plugins to plugins directory
Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 36a5f3f9a6..b5b8ae3405 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -45,15 +45,15 @@ exists(src/shared/qbs/qbs.pro) { QBS_RESOURCES_INSTALL_DIR = $${QTC_PREFIX}/share/qtcreator/qbs cache(QBS_RESOURCES_INSTALL_DIR) macx { - QBS_PLUGINS_BUILD_DIR = $${IDE_LIBRARY_PATH} - QBS_APPS_RPATH_DIR = @loader_path/../PlugIns + 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 + QBS_PLUGINS_BUILD_DIR = $${IDE_BUILD_TREE}/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins 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 + QBS_PLUGINS_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins cache(QBS_PLUGINS_INSTALL_DIR) QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} cache(QBS_LIBRARY_DIRNAME) |