diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-29 15:19:22 +0200 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-29 15:44:09 +0200 |
| commit | 01f7711fb5e0d052d57e6113512ef902b0cb1cd2 (patch) | |
| tree | a00bfc68bd7f30f0adecd2633d8b14d16f4ae12d /common.pri | |
| parent | 8290a679acaf180ec778c7271c16fb0e902a1001 (diff) | |
Fixed failures of tests using test helper programs.
The test helpers should be installed alongside the tests to ensure they
can be found during test execution.
Diffstat (limited to 'common.pri')
| -rw-r--r-- | common.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common.pri b/common.pri index c8dd7b390f..83fb1ddfd5 100644 --- a/common.pri +++ b/common.pri @@ -87,7 +87,7 @@ contains(build_unit_tests, yes) { #test whether we have a unit test -!testcase { +!testcase:!testhelper { OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET !plugin { contains(TEMPLATE,.*lib) { @@ -117,7 +117,7 @@ contains(build_unit_tests, yes) { QMAKE_RPATHDIR += $$QT_MOBILITY_LIB } else { # Unit test code (no plugins! test plugins are just normal plugins installed elsewhere) - QT *= testlib + testcase:QT *= testlib CONFIG += console CONFIG -= app_bundle OBJECTS_DIR = $$OUTPUT_DIR/build/tests/$$SUBDIRPART/$$TARGET |