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

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
index 3452a92fe2..d4e7602900 100644
--- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
+++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
 
 SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT += network testlib
 QT -= gui
 
 TARGET = tst_qsslsocket_onDemandCertificates_static
@@ -10,7 +10,7 @@ TARGET = tst_qsslsocket_onDemandCertificates_static
 win32 {
   CONFIG(debug, debug|release) {
     DESTDIR = debug
-} else {
+  } else {
     DESTDIR = release
   }
 }