feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tests: Replace SSH scripting crutch with proper rpath solution.

Browse Source 
Change-Id: Ieae3099d5fe2f69415a86a0e2155d30b699fa3c4
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-11-21 11:07:57 +01:00
parent ab45b7e663
commit abd98ebeaa
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/manual/ssh/call.sh
View File

@@ -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" "$@"

10
tests/manual/ssh/ssh.pri
View File

@@ -6,6 +6,10 @@ LIBS += -L$$IDE_PLUGIN_PATH/Nokia
macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\" macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
LIBS *= -L$$IDE_LIBRARY_PATH/Nokia 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 += core
QT -= gui QT -= gui
@@ -15,9 +19,3 @@ TEMPLATE = app
DEPENDPATH+=. DEPENDPATH+=.
INCLUDEPATH+=. 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
}