diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-10-25 14:42:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 08:42:23 +0200 |
commit | d04bf8f4073aa50b23ae154250932b5ddd3ddc0a (patch) | |
tree | 7a44d578fe0aa03facee96d75eaccbcedfc298fd /tests/auto/other | |
parent | 6b29e881cdd93d8fccec50df9e8d001776800136 (diff) |
all remaining tests: eliminated usage of qttest_p4.prf
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: I02fe27b2c1800f929250fa8694ca2976c9661a12
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/atwrapper/atWrapper.pro | 4 | ||||
-rw-r--r-- | tests/auto/other/compiler/compiler.pro | 5 | ||||
-rw-r--r-- | tests/auto/other/headersclean/headersclean.pro | 5 | ||||
-rw-r--r-- | tests/auto/other/qtokenautomaton/qtokenautomaton.pro | 5 |
4 files changed, 11 insertions, 8 deletions
diff --git a/tests/auto/other/atwrapper/atWrapper.pro b/tests/auto/other/atwrapper/atWrapper.pro index 323ca1bf5f..5dcbdb98ce 100644 --- a/tests/auto/other/atwrapper/atWrapper.pro +++ b/tests/auto/other/atwrapper/atWrapper.pro @@ -7,13 +7,13 @@ TEMPLATE = app INCLUDEPATH += $$ARTHUR DEFINES += SRCDIR=\\\"$$PWD\\\" -QT += xml svg network +QT += xml svg network testlib contains(QT_CONFIG, opengl):QT += opengl include($$ARTHUR/datagenerator/datagenerator.pri) -load(qttest_p4) +CONFIG += testcase # Input HEADERS += atWrapper.h diff --git a/tests/auto/other/compiler/compiler.pro b/tests/auto/other/compiler/compiler.pro index c444c63af6..e6307ac9ec 100644 --- a/tests/auto/other/compiler/compiler.pro +++ b/tests/auto/other/compiler/compiler.pro @@ -1,7 +1,8 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_compiler SOURCES += tst_compiler.cpp baseclass.cpp derivedclass.cpp HEADERS += baseclass.h derivedclass.h -QT = core +QT = core testlib diff --git a/tests/auto/other/headersclean/headersclean.pro b/tests/auto/other/headersclean/headersclean.pro index 39cce8cde0..814f19c865 100644 --- a/tests/auto/other/headersclean/headersclean.pro +++ b/tests/auto/other/headersclean/headersclean.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_headersclean SOURCES += tst_headersclean.cpp -QT = core network xml sql +QT = core network xml sql testlib contains(QT_CONFIG,dbus): QT += dbus contains(QT_CONFIG,opengl): QT += opengl diff --git a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro index 5e2e590a4b..a4af4bc1c5 100644 --- a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro +++ b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qtokenautomaton SOURCES += tst_qtokenautomaton.cpp \ tokenizers/basic/basic.cpp \ tokenizers/basicNamespace/basicNamespace.cpp \ @@ -14,5 +15,5 @@ HEADERS += tokenizers/basic/basic.h \ tokenizers/noToString/noToString.h \ tokenizers/withNamespace/withNamespace.h -QT -= gui +QT = core testlib CONFIG += parallel_test |