diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-11-21 11:07:57 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2011-11-21 11:10:15 +0100 |
| commit | abd98ebeaa1b63b1a95630844d681f3f7e22b715 (patch) | |
| tree | 1c5b67f9c5239786e3f334d6dcef6f4aa82535af /tests/manual/ssh | |
| parent | ab45b7e663590d9f2a0ae82cc2fa7ae87405125a (diff) | |
| download | qt-creator-abd98ebeaa1b63b1a95630844d681f3f7e22b715.tar.gz | |
Tests: Replace SSH scripting crutch with proper rpath solution.
Change-Id: Ieae3099d5fe2f69415a86a0e2155d30b699fa3c4
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'tests/manual/ssh')
| -rwxr-xr-x | tests/manual/ssh/call.sh | 5 | ||||
| -rw-r--r-- | tests/manual/ssh/ssh.pri | 10 |
2 files changed, 4 insertions, 11 deletions
diff --git a/tests/manual/ssh/call.sh b/tests/manual/ssh/call.sh deleted file mode 100755 index 57073726f8..0000000000 --- a/tests/manual/ssh/call.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -dir_name=`dirname $0` -exec=`basename $dir_name` -LD_LIBRARY_PATH=../../../lib/qtcreator:../../../lib/qtcreator/plugins/Nokia:$LD_LIBRARY_PATH "$dir_name/$exec" "$@" diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri index c7ee1bad02..8a8bb6a95b 100644 --- a/tests/manual/ssh/ssh.pri +++ b/tests/manual/ssh/ssh.pri @@ -6,6 +6,10 @@ LIBS += -L$$IDE_PLUGIN_PATH/Nokia macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\" INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins LIBS *= -L$$IDE_LIBRARY_PATH/Nokia +unix { + QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_PLUGIN_PATH/..\" + QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_PLUGIN_PATH/Nokia\" +} QT += core QT -= gui @@ -15,9 +19,3 @@ TEMPLATE = app DEPENDPATH+=. INCLUDEPATH+=. - -unix { - copy_script.commands = cp -a $${PWD}/call.sh $$OUT_PWD/$${TARGET}.sh - first.depends = $(first) copy_script - QMAKE_EXTRA_TARGETS += first copy_script -} |