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>
This commit is contained in:
Eike Ziller
2019-10-29 17:12:33 +01:00
parent 5f8efe43f2
commit 53819123e7
13 changed files with 32 additions and 27 deletions

View File

@@ -1,5 +1,4 @@
QTC_PLUGIN_DEPENDS += cpptools
include(../../qttest.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"