From f92875751767cd79a6e574d68def3777680483c5 Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Mon, 1 Nov 2010 11:40:20 +1000
Subject: [PATCH] tests: Allow tests to use creator libs/plugins directly
(linux/mac)
---
tests/auto/cplusplus/shared/shared.pri | 1 -
tests/auto/qttest.pri | 11 +++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index 32ff527d768..2fb98dc31d9 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -1,5 +1,4 @@
DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
-include(../../../../qtcreator.pri)
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri
index 23e44ef21d5..10af3ee3e6f 100644
--- a/tests/auto/qttest.pri
+++ b/tests/auto/qttest.pri
@@ -1,3 +1,5 @@
+include(../../qtcreator.pri)
+
isEmpty(TEMPLATE):TEMPLATE=app
CONFIG += qt warn_on console depend_includepath testcase qtestlib
CONFIG -= app_bundle
@@ -9,5 +11,14 @@ symbian:{
RSS_RULES ="group_name=\"QtTests\";"
}
+unix:{
+ 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}\'
+}
+
# prefix test binary with tst_
!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
--
GitLab