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 /src/qtcreatorplugin.pri | |
| parent | fcf5c0ea202105ed17e1bc321993c5a3bc72d546 (diff) | |
| download | qt-creator-deea0022f7ea1bdc48ceafe57c2dfbfd848ac8a8.tar.gz | |
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 'src/qtcreatorplugin.pri')
| -rw-r--r-- | src/qtcreatorplugin.pri | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 6b9b0237cf..a1fd8253d9 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -110,17 +110,8 @@ pluginspec2json.CONFIG += no_link moc_header.depends += $$pluginspec2json.output QMAKE_EXTRA_COMPILERS += pluginspec2json -macx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ - QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../ -} else:linux-* { - #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - QMAKE_RPATHDIR += \$\$ORIGIN - QMAKE_RPATHDIR += \$\$ORIGIN/.. - IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' - QMAKE_RPATHDIR = -} +osx: QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ +include(rpath.pri) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols |