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/dbus | |
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/dbus')
21 files changed, 58 insertions, 42 deletions
diff --git a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro index 09ab7ac98f..d67d81e4bf 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro +++ b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core core-private +CONFIG += testcase +TARGET = tst_qdbusabstractadaptor +QT = core core-private testlib TEMPLATE = subdirs CONFIG += ordered SUBDIRS = qmyserver test diff --git a/tests/auto/dbus/qdbusabstractadaptor/test/test.pro b/tests/auto/dbus/qdbusabstractadaptor/test/test.pro index 52aa578fd4..e8943211c8 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/test/test.pro +++ b/tests/auto/dbus/qdbusabstractadaptor/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusabstractadaptor.cpp HEADERS += ../myobject.h TARGET = ../tst_qdbusabstractadaptor -QT = core core-private dbus +QT = core core-private dbus testlib diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro index 05e0c51084..9d8d542b88 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro @@ -1,4 +1,5 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdbusabstractinterface TEMPLATE = subdirs CONFIG += ordered SUBDIRS = qpinger test diff --git a/tests/auto/dbus/qdbusabstractinterface/test/test.pro b/tests/auto/dbus/qdbusabstractinterface/test/test.pro index 98bcaa70f5..aba7f57b20 100644 --- a/tests/auto/dbus/qdbusabstractinterface/test/test.pro +++ b/tests/auto/dbus/qdbusabstractinterface/test/test.pro @@ -1,4 +1,4 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusabstractinterface.cpp ../interface.cpp HEADERS += ../interface.h @@ -9,5 +9,5 @@ HEADERS += ../pinger.h TARGET = ../tst_qdbusabstractinterface -QT = core +QT = core testlib QT += dbus diff --git a/tests/auto/dbus/qdbusconnection/qdbusconnection.pro b/tests/auto/dbus/qdbusconnection/qdbusconnection.pro index cbc7a979eb..8c729aaf33 100644 --- a/tests/auto/dbus/qdbusconnection/qdbusconnection.pro +++ b/tests/auto/dbus/qdbusconnection/qdbusconnection.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusconnection +QT = core dbus testlib SOURCES += tst_qdbusconnection.cpp diff --git a/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro index 2eae2e045b..97d3c0ebf4 100644 --- a/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro +++ b/tests/auto/dbus/qdbusconnection_no_bus/qdbusconnection_no_bus.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusconnection_no_bus +QT = core dbus testlib SOURCES += tst_qdbusconnection_no_bus.cpp diff --git a/tests/auto/dbus/qdbuscontext/qdbuscontext.pro b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro index 23fc22f440..4eb8cd9135 100644 --- a/tests/auto/dbus/qdbuscontext/qdbuscontext.pro +++ b/tests/auto/dbus/qdbuscontext/qdbuscontext.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbuscontext +QT = core dbus testlib SOURCES += tst_qdbuscontext.cpp diff --git a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro index 8992828009..093a888765 100644 --- a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro +++ b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core +CONFIG += testcase +TARGET = tst_qdbusinterface +QT = core testlib TEMPLATE = subdirs CONFIG += ordered SUBDIRS = qmyserver test diff --git a/tests/auto/dbus/qdbusinterface/test/test.pro b/tests/auto/dbus/qdbusinterface/test/test.pro index 2ef7a89c56..15af258e3a 100644 --- a/tests/auto/dbus/qdbusinterface/test/test.pro +++ b/tests/auto/dbus/qdbusinterface/test/test.pro @@ -1,6 +1,6 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusinterface.cpp HEADERS += ../myobject.h TARGET = ../tst_qdbusinterface -QT = core core-private dbus +QT = core core-private dbus testlib diff --git a/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro b/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro index 3375bb53a6..3577210b86 100644 --- a/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro +++ b/tests/auto/dbus/qdbuslocalcalls/qdbuslocalcalls.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbuslocalcalls +QT = core dbus testlib SOURCES += tst_qdbuslocalcalls.cpp diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro index dc2145aba2..0578433d58 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdbusmarshall TEMPLATE = subdirs CONFIG += ordered SUBDIRS = qpong test -QT += core-private +QT += core-private testlib requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/dbus/qdbusmarshall/test/test.pro b/tests/auto/dbus/qdbusmarshall/test/test.pro index ba4d99b57d..e4d1c6b8dd 100644 --- a/tests/auto/dbus/qdbusmarshall/test/test.pro +++ b/tests/auto/dbus/qdbusmarshall/test/test.pro @@ -1,9 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qdbusmarshall.cpp TARGET = ../tst_qdbusmarshall -QT = core -QT += core-private dbus-private +QT = core-private dbus-private testlib LIBS += $$QT_LIBS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS diff --git a/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro b/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro index c2dec0993c..12f801613d 100644 --- a/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro +++ b/tests/auto/dbus/qdbusmetaobject/qdbusmetaobject.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus-private +CONFIG += testcase +TARGET = tst_qdbusmetaobject +QT = core dbus-private testlib SOURCES += tst_qdbusmetaobject.cpp diff --git a/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro b/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro index 15b97de70c..38d7370667 100644 --- a/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro +++ b/tests/auto/dbus/qdbusmetatype/qdbusmetatype.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusmetatype +QT = core dbus testlib SOURCES += tst_qdbusmetatype.cpp diff --git a/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro index aff27e5cb3..799df6e995 100644 --- a/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro +++ b/tests/auto/dbus/qdbuspendingcall/qdbuspendingcall.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbuspendingcall +QT = core dbus testlib SOURCES += tst_qdbuspendingcall.cpp CONFIG+=insignificant_test diff --git a/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro b/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro index 9eca779290..814e40decc 100644 --- a/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro +++ b/tests/auto/dbus/qdbuspendingreply/qdbuspendingreply.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbuspendingreply +QT = core dbus testlib SOURCES += tst_qdbuspendingreply.cpp diff --git a/tests/auto/dbus/qdbusreply/qdbusreply.pro b/tests/auto/dbus/qdbusreply/qdbusreply.pro index 492a3a7bc4..42e9e6dddc 100644 --- a/tests/auto/dbus/qdbusreply/qdbusreply.pro +++ b/tests/auto/dbus/qdbusreply/qdbusreply.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusreply +QT = core dbus testlib SOURCES += tst_qdbusreply.cpp diff --git a/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro b/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro index 51f5f90687..e689a5cfa3 100644 --- a/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro +++ b/tests/auto/dbus/qdbusservicewatcher/qdbusservicewatcher.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusservicewatcher +QT = core dbus testlib SOURCES += tst_qdbusservicewatcher.cpp diff --git a/tests/auto/dbus/qdbusthreading/qdbusthreading.pro b/tests/auto/dbus/qdbusthreading/qdbusthreading.pro index f8f319d960..95358b2003 100644 --- a/tests/auto/dbus/qdbusthreading/qdbusthreading.pro +++ b/tests/auto/dbus/qdbusthreading/qdbusthreading.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core dbus +CONFIG += testcase +TARGET = tst_qdbusthreading +QT = core dbus testlib SOURCES += tst_qdbusthreading.cpp diff --git a/tests/auto/dbus/qdbustype/qdbustype.pro b/tests/auto/dbus/qdbustype/qdbustype.pro index 1ae84384b7..df114d9f44 100644 --- a/tests/auto/dbus/qdbustype/qdbustype.pro +++ b/tests/auto/dbus/qdbustype/qdbustype.pro @@ -1,5 +1,6 @@ -load(qttest_p4) -QT = core-private dbus-private +CONFIG += testcase +TARGET = tst_qdbustype +QT = core-private dbus-private testlib SOURCES += tst_qdbustype.cpp QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS LIBS_PRIVATE += $$QT_LIBS_DBUS diff --git a/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro b/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro index da95823168..ac168bdf76 100644 --- a/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro +++ b/tests/auto/dbus/qdbusxmlparser/qdbusxmlparser.pro @@ -1,3 +1,4 @@ -load(qttest_p4) -QT = core-private dbus-private +CONFIG += testcase +TARGET = tst_qdbusxmlparser +QT = core-private dbus-private testlib SOURCES += tst_qdbusxmlparser.cpp |