diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-12 23:08:15 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-12 23:08:15 +1000 |
| commit | 10ae84446e736941700c39a67d8b4d64a74de89e (patch) | |
| tree | d6aa6b25a2092dd4c03fc0ca332891dc8bf204c9 | |
| parent | a9bf77fd378d8a8820beb7319eb4b74ae62d4560 (diff) | |
| parent | 0336bc0cc8b4c0b0e75315594c1db83ee9b30f2e (diff) | |
| download | qt4-tools-10ae84446e736941700c39a67d8b4d64a74de89e.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Backporting TESTARGS feature from 4.7
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index e3faef12f4..a01455e9f8 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -24,6 +24,7 @@ else:win32: { else:check.commands += $(DESTDIR_TARGET) } embedded: check.commands += -qws +check.commands += $(TESTARGS) QMAKE_EXTRA_TARGETS += check !debug_and_release|build_pass { |