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/tools | |
| 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/tools')
| -rw-r--r-- | src/tools/cplusplus-shared/tool.pri | 2 | ||||
| -rw-r--r-- | src/tools/iostool/iostool.pro | 2 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet/qml2puppet.pro | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/cplusplus-shared/tool.pri b/src/tools/cplusplus-shared/tool.pri index 569d099e2f..dbd31739a3 100644 --- a/src/tools/cplusplus-shared/tool.pri +++ b/src/tools/cplusplus-shared/tool.pri @@ -1,6 +1,8 @@ QTC_LIB_DEPENDS += cplusplus include(../../../qtcreator.pri) + +RPATH_BASE = $$IDE_BIN_PATH include(../../rpath.pri) DESTDIR = $$IDE_BIN_PATH diff --git a/src/tools/iostool/iostool.pro b/src/tools/iostool/iostool.pro index 8ea9a78d6b..4ecd607ac2 100644 --- a/src/tools/iostool/iostool.pro +++ b/src/tools/iostool/iostool.pro @@ -19,6 +19,8 @@ include(../../../qtcreator.pri) # put into a subdir, so we can deploy a separate qt.conf for it DESTDIR = $$IDE_LIBEXEC_PATH/ios + +RPATH_BASE = $$DESTDIR include(../../rpath.pri) SOURCES += main.cpp \ diff --git a/src/tools/qml2puppet/qml2puppet/qml2puppet.pro b/src/tools/qml2puppet/qml2puppet/qml2puppet.pro index 9644cf4bca..403f8e24fb 100644 --- a/src/tools/qml2puppet/qml2puppet/qml2puppet.pro +++ b/src/tools/qml2puppet/qml2puppet/qml2puppet.pro @@ -7,6 +7,7 @@ include(../../../../qtcreator.pri) osx: DESTDIR = $$IDE_LIBEXEC_PATH/qmldesigner else: DESTDIR = $$IDE_LIBEXEC_PATH +RPATH_BASE = $$DESTDIR include(../../../rpath.pri) include(../../../../share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri) |