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.

Since QT+= had to be touched already, this change also removes a lot of
useless duplication on those lines.

Change-Id: I9f2f20eaf4a0e676beddf474c7db8680e4712f78
Reviewed-on: http://codereview.qt-project.org/6302
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

21 files changed, 63 insertions, 63 deletions

diff --git a/tests/auto/particles/qsgage/qsgage.pro b/tests/auto/particles/qsgage/qsgage.pro
index bdcf720618..e4904c8691 100644
--- a/tests/auto/particles/qsgage/qsgage.pro
+++ b/tests/auto/particles/qsgage/qsgage.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgage
 SOURCES += tst_qsgage.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro b/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro
index d58fe4b66a..e22706e6fd 100644
--- a/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro
+++ b/tests/auto/particles/qsgangleddirection/qsgangleddirection.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgangleddirection
 SOURCES += tst_qsgangleddirection.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro b/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro
index f069178f57..c1151a1ae6 100644
--- a/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro
+++ b/tests/auto/particles/qsgcumulativedirection/qsgcumulativedirection.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgcumulativedirection
 SOURCES += tst_qsgcumulativedirection.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro b/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro
index 3365ef1f0c..7af77e830b 100644
--- a/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro
+++ b/tests/auto/particles/qsgcustomaffector/qsgcustomaffector.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgcustomaffector
 SOURCES += tst_qsgcustomaffector.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro b/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro
index 313c84c92b..76866a1bcb 100644
--- a/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro
+++ b/tests/auto/particles/qsgcustomparticle/qsgcustomparticle.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgcustomparticle
 SOURCES += tst_qsgcustomparticle.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro b/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro
index 403606cd7d..6cf3b431ad 100644
--- a/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro
+++ b/tests/auto/particles/qsgellipseextruder/qsgellipseextruder.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgellipseextruder
 SOURCES += tst_qsgellipseextruder.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgfriction/qsgfriction.pro b/tests/auto/particles/qsgfriction/qsgfriction.pro
index 6288612b47..e914fee4dd 100644
--- a/tests/auto/particles/qsgfriction/qsgfriction.pro
+++ b/tests/auto/particles/qsgfriction/qsgfriction.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgfriction
 SOURCES += tst_qsgfriction.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsggravity/qsggravity.pro b/tests/auto/particles/qsggravity/qsggravity.pro
index f60e3512ee..68f620355d 100644
--- a/tests/auto/particles/qsggravity/qsggravity.pro
+++ b/tests/auto/particles/qsggravity/qsggravity.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsggravity
 SOURCES += tst_qsggravity.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro b/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro
index 592be21a82..4e36e06c23 100644
--- a/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro
+++ b/tests/auto/particles/qsgimageparticle/qsgimageparticle.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgimageparticle
 SOURCES += tst_qsgimageparticle.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro b/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro
index fd75e25728..49729ac78a 100644
--- a/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro
+++ b/tests/auto/particles/qsgitemparticle/qsgitemparticle.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgitemparticle
 SOURCES += tst_qsgitemparticle.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsglineextruder/qsglineextruder.pro b/tests/auto/particles/qsglineextruder/qsglineextruder.pro
index 78ab2eb3da..00d61d8bf7 100644
--- a/tests/auto/particles/qsglineextruder/qsglineextruder.pro
+++ b/tests/auto/particles/qsglineextruder/qsglineextruder.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsglineextruder
 SOURCES += tst_qsglineextruder.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro b/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro
index 50076dbfaa..a60d3dab0f 100644
--- a/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro
+++ b/tests/auto/particles/qsgmaskextruder/qsgmaskextruder.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgmaskextruder
 SOURCES += tst_qsgmaskextruder.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro b/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro
index 4f51a09a80..1376ab8255 100644
--- a/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro
+++ b/tests/auto/particles/qsgparticlegroup/qsgparticlegroup.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgparticlegroup
 SOURCES += tst_qsgparticlegroup.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro b/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro
index 0393ce079e..81378295e4 100644
--- a/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro
+++ b/tests/auto/particles/qsgparticlesystem/qsgparticlesystem.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgparticlesystem
 SOURCES += tst_qsgparticlesystem.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro b/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro
index 9bdcfa141e..03d0de6f7b 100644
--- a/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro
+++ b/tests/auto/particles/qsgpointattractor/qsgpointattractor.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgpointattractor
 SOURCES += tst_qsgpointattractor.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro b/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro
index 8e5a1be44f..4d2f2bf25e 100644
--- a/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro
+++ b/tests/auto/particles/qsgpointdirection/qsgpointdirection.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgpointdirection
 SOURCES += tst_qsgpointdirection.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro b/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro
index 7cf10ca04d..8180dbfaa2 100644
--- a/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro
+++ b/tests/auto/particles/qsgrectangleextruder/qsgrectangleextruder.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgrectangleextruder
 SOURCES += tst_qsgrectangleextruder.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro b/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro
index 71996a00a4..f6016be9f7 100644
--- a/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro
+++ b/tests/auto/particles/qsgtargetdirection/qsgtargetdirection.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgtargetdirection
 SOURCES += tst_qsgtargetdirection.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro b/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro
index a695d5c387..bae358e9e2 100644
--- a/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro
+++ b/tests/auto/particles/qsgtrailemitter/qsgtrailemitter.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgtrailemitter
 SOURCES += tst_qsgtrailemitter.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgturbulence/qsgturbulence.pro b/tests/auto/particles/qsgturbulence/qsgturbulence.pro
index e38d21bdfa..ffec48f1b4 100644
--- a/tests/auto/particles/qsgturbulence/qsgturbulence.pro
+++ b/tests/auto/particles/qsgturbulence/qsgturbulence.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgturbulence
 SOURCES += tst_qsgturbulence.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib
 
diff --git a/tests/auto/particles/qsgwander/qsgwander.pro b/tests/auto/particles/qsgwander/qsgwander.pro
index cf9d88ccca..7ea187b6bd 100644
--- a/tests/auto/particles/qsgwander/qsgwander.pro
+++ b/tests/auto/particles/qsgwander/qsgwander.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qsgwander
 SOURCES += tst_qsgwander.cpp
 macx:CONFIG -= app_bundle
 
@@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles
 
 CONFIG += insignificant_test
 
-QT += core-private gui-private v8-private declarative-private opengl-private
+QT += core-private gui-private v8-private declarative-private opengl-private testlib