diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-29 17:12:33 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-04 10:31:55 +0000 |
| commit | 53819123e73479b8d9075a86b5a7bef12a87cc26 (patch) | |
| tree | 617ebee23a8132fc3b91c604143c94ecb186f212 /src/qtcreatorplugin.pri | |
| parent | 5f8efe43f2575b8e4f3f743d12c81051744b9d13 (diff) | |
Simplify RPATHs for qmake build
Use central rpath.pri for setting RPATHs and qttestrpath.pri for tests.
Simplify install names of plugins and libraries on macOS to be just
@rpath/libName, which follows convention better and makes setting up
RPATHs easier.
Preparation for moving tools one directory level down on macOS, to
be able to add a qt.conf for the tools generically.
Task-number: QTCREATORBUG-23120
Change-Id: I16625d48904abd3a7f4c2ad7bbba5916cdc400cd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/qtcreatorplugin.pri')
| -rw-r--r-- | src/qtcreatorplugin.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index a409ec19a5..806ed6f865 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -85,9 +85,11 @@ exists($$PLUGINJSON_IN) { } osx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ QMAKE_LFLAGS += -compatibility_version $$QTCREATOR_COMPAT_VERSION } + +RPATH_BASE = $$IDE_PLUGIN_PATH include(rpath.pri) contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols |