diff options
| -rw-r--r-- | tests/auto/cplusplus/shared/shared.pri | 1 | ||||
| -rw-r--r-- | tests/auto/qttest.pri | 4 | ||||
| -rw-r--r-- | tests/manual/process/process.pro | 2 | ||||
| -rw-r--r-- | tests/manual/ssh/ssh.pri | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri index fbef984bd6..ae551666c6 100644 --- a/tests/auto/cplusplus/shared/shared.pri +++ b/tests/auto/cplusplus/shared/shared.pri @@ -3,5 +3,6 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) include($$IDE_SOURCE_TREE/src/rpath.pri) + LIBS += -L$$IDE_PLUGIN_PATH/Nokia DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/Nokia\\\"\" diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri index 10af3ee3e6..d043ec4241 100644 --- a/tests/auto/qttest.pri +++ b/tests/auto/qttest.pri @@ -11,13 +11,15 @@ symbian:{ RSS_RULES ="group_name=\"QtTests\";" } -unix:{ +linux-* { QMAKE_RPATHDIR += $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/Nokia IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' +} else:macx { + QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/../\" } # prefix test binary with tst_ diff --git a/tests/manual/process/process.pro b/tests/manual/process/process.pro index 02094ebfab..9f91dbbac5 100644 --- a/tests/manual/process/process.pro +++ b/tests/manual/process/process.pro @@ -11,7 +11,7 @@ QT += gui include(../../../qtcreator.pri) # -- Add creator 'utils' lib - +macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\" LIBS *= -l$$qtLibraryName(Utils) TARGET = process diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri index ddf37d84e0..e41fd2d3ac 100644 --- a/tests/manual/ssh/ssh.pri +++ b/tests/manual/ssh/ssh.pri @@ -1,6 +1,7 @@ include (../../../qtcreator.pri) include (../../../src/plugins/coreplugin/coreplugin.pri) +macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\" INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins LIBS *= -L$$IDE_LIBRARY_PATH/Nokia |