diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-26 16:01:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-26 16:01:12 (GMT) |
| commit | 8c94ee1f77f665d80a0590e7dd003e8089ff353f (patch) | |
| tree | 5860e44d7e156370257ce3fb92ad9864ed042ece /tests/auto/qmake/qmake.pro | |
| parent | 1ac559f5ea335de5d78bef8d991133b95081a1b7 (diff) | |
| parent | 09988a95fc64068c3c0968fa97a31a2b8081715e (diff) | |
| download | Qt-8c94ee1f77f665d80a0590e7dd003e8089ff353f.zip Qt-8c94ee1f77f665d80a0590e7dd003e8089ff353f.tar.gz Qt-8c94ee1f77f665d80a0590e7dd003e8089ff353f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
tests: eliminated usage of qttest_p4.prf
Diffstat (limited to 'tests/auto/qmake/qmake.pro')
| -rw-r--r-- | tests/auto/qmake/qmake.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qmake/qmake.pro b/tests/auto/qmake/qmake.pro index d0faa87..e78da4c 100644 --- a/tests/auto/qmake/qmake.pro +++ b/tests/auto/qmake/qmake.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qmake HEADERS += testcompiler.h SOURCES += tst_qmake.cpp testcompiler.cpp -QT -= gui +QT = core testlib cross_compile: DEFINES += QMAKE_CROSS_COMPILED |