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/network/bearer | |
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/network/bearer')
3 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro index 8910fbc209..b01f8d380e 100644 --- a/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro +++ b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkconfiguration SOURCES += tst_qnetworkconfiguration.cpp HEADERS += ../qbearertestcommon.h -QT = core network +QT = core network testlib maemo6|maemo5 { CONFIG += link_pkgconfig diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro index 8dfd3402bc..e7ff28ee63 100644 --- a/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro @@ -1,8 +1,9 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qnetworkconfigurationmanager SOURCES += tst_qnetworkconfigurationmanager.cpp HEADERS += ../qbearertestcommon.h -QT = core network +QT = core network testlib maemo6|maemo5 { CONFIG += link_pkgconfig diff --git a/tests/auto/network/bearer/qnetworksession/test/test.pro b/tests/auto/network/bearer/qnetworksession/test/test.pro index 97a6cdce5f..4b4f5c9c4e 100644 --- a/tests/auto/network/bearer/qnetworksession/test/test.pro +++ b/tests/auto/network/bearer/qnetworksession/test/test.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += tst_qnetworksession.cpp HEADERS += ../../qbearertestcommon.h -QT = core network +QT = core network testlib TARGET = tst_qnetworksession CONFIG(debug_and_release) { |