From 84ef4819d3f235f762c386502c826dd6a8a3ba75 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Fri, 4 Jul 2014 23:41:08 +0200
Subject: [PATCH] don't use rpath for the test binaries so we don't need to
 strip it

this breaks the make check targets without manually exporting
LD_LIBRARY_PATH, but the make test target still works.
---
 guh.pro                  | 3 ++-
 tests/auto/autotests.pri | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/guh.pro b/guh.pro
index 418f1f77..e8182f74 100644
--- a/guh.pro
+++ b/guh.pro
@@ -17,7 +17,8 @@ doc.commands = cd $$top_srcdir/doc; qdoc config.qdocconf; cp images/mascot.png h
 
 licensecheck.commands = $$top_srcdir/tests/auto/checklicenseheaders.sh $$top_srcdir
 
-test.depends = licensecheck check
+test.depends = licensecheck
+test.commands = LD_LIBRARY_PATH=$$top_builddir/libguh make check
 
 QMAKE_EXTRA_TARGETS += licensecheck doc test
 
diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri
index df3b790c..8c75d113 100644
--- a/tests/auto/autotests.pri
+++ b/tests/auto/autotests.pri
@@ -6,7 +6,6 @@ include($$top_srcdir/server/server.pri)
 DEFINES += TESTING_ENABLED
 INCLUDEPATH += $$top_srcdir/server/ $$top_srcdir/server/jsonrpc $$top_srcdir/libguh $$top_srcdir/tests/auto/
 LIBS += -L$$top_builddir/libguh/ -lguh -L$$top_builddir/plugins/deviceplugins/mock/ -lguh_devicepluginmock
-QMAKE_LFLAGS += -Wl,--rpath=$$top_builddir/libguh
 
 SOURCES += ../guhtestbase.cpp \
     ../mocktcpserver.cpp \