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>
sailfishos · Oct 11, 2011 · 47e1b91 · 47e1b91
1 parent 1fcafbe
commit 47e1b91
Show file tree

Hide file tree

Showing 159 changed files with 459 additions and 468 deletions.
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_examples
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_examples.cpp
@@ -8,6 +8,6 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 CONFIG += parallel_test
 #temporary
 CONFIG += insignificant_test
-QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private
+QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private testlib
 
 qpa:CONFIG+=insignificant_test  # QTBUG-20990, aborts
diff --git a/tests/auto/declarative/geometry/geometry.pro b/tests/auto/declarative/geometry/geometry.pro
@@ -1,11 +1,9 @@
-load(qttest_p4)
-QT       += opengl declarative
-
+CONFIG += testcase
 TARGET = tst_geometry
 macx:CONFIG   -= app_bundle
 
 SOURCES += tst_geometry.cpp
 
 CONFIG+=parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private opengl testlib
diff --git a/tests/auto/declarative/nodes/nodes.pro b/tests/auto/declarative/nodes/nodes.pro
@@ -1,11 +1,9 @@
-load(qttest_p4)
-QT       += opengl declarative widgets
-
+CONFIG += testcase
 TARGET = tst_nodestest
 macx:CONFIG   -= app_bundle
 
 SOURCES += tst_nodestest.cpp
 
 CONFIG+=parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private opengl widgets testlib
diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_parserstress
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_parserstress.cpp
@@ -11,4 +11,4 @@ SOURCES += tst_parserstress.cpp
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative opengl
+CONFIG += testcase
+TARGET = tst_qdeclarativeanimations
 SOURCES += tst_qdeclarativeanimations.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_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/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro
@@ -1,8 +1,8 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
+CONFIG += testcase
+TARGET = tst_qdeclarativeapplication
 macx:CONFIG -= app_bundle
 #temporary
 CONFIG += insignificant_test
 SOURCES += tst_qdeclarativeapplication.cpp
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
 
diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative opengl
+CONFIG += testcase
+TARGET = tst_qdeclarativebehaviors
 SOURCES += tst_qdeclarativebehaviors.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test 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/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
+CONFIG += testcase
+TARGET = tst_qdeclarativebinding
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativebinding.cpp
@@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro b/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
+CONFIG += testcase
+TARGET = tst_qdeclarativechangeset
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativechangeset.cpp
@@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += network
+CONFIG += testcase
+TARGET = tst_qdeclarativecomponent
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativecomponent.cpp 
@@ -9,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private network testlib
diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
+CONFIG += testcase
+TARGET = tst_qdeclarativeconnection
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeconnection.cpp
@@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_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/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qdeclarativecontext
 SOURCES += tst_qdeclarativecontext.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro b/tests/auto/declarative/qdeclarativecpputils/qdeclarativecpputils.pro
@@ -1,9 +1,9 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qdeclarativecpputils
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativecpputils.cpp
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += network declarative
+CONFIG += testcase
+TARGET = tst_qdeclarativedebugclient
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h
@@ -8,5 +8,5 @@ SOURCES += tst_qdeclarativedebugclient.cpp \
 
 CONFIG += declarative_debug
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private network testlib
 
diff --git a/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += declarative network script declarative-private
+CONFIG += testcase
+TARGET = tst_qdeclarativedebugjs
+QT += network script declarative-private testlib
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h

diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += network declarative
+CONFIG += testcase
+TARGET = tst_qdeclarativedebugservice
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h
@@ -8,4 +8,4 @@ SOURCES += tst_qdeclarativedebugservice.cpp \
 
 CONFIG += parallel_test declarative_debug
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private network testlib
diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative network widgets
+CONFIG += testcase
+TARGET = tst_qdeclarativeecmascript
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeecmascript.cpp \
@@ -17,4 +17,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 CONFIG += parallel_test
 #temporary
 CONFIG += insignificant_test
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private network widgets testlib
diff --git a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative network
+CONFIG += testcase
+TARGET = tst_qdeclarativeengine
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeengine.cpp 
@@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private network testlib
diff --git a/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro b/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += network declarative
+CONFIG += testcase
+TARGET = tst_qdeclarativeenginedebug
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h
@@ -8,4 +8,4 @@ SOURCES += tst_qdeclarativeenginedebug.cpp \
 
 CONFIG += parallel_test declarative_debug
 
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private network testlib
diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qdeclarativeerror
 SOURCES += tst_qdeclarativeerror.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro b/tests/auto/declarative/qdeclarativeexpression/qdeclarativeexpression.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
+CONFIG += testcase
+TARGET = tst_qdeclarativeexpression
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeexpression.cpp
@@ -8,4 +8,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qdeclarativefolderlistmodel
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativefolderlistmodel.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui network
+CONFIG += testcase
+TARGET = tst_qdeclarativefontloader
 macx:CONFIG -= app_bundle
 
 HEADERS += ../../declarative/shared/testhttpserver.h
@@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private network testlib
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += network
+CONFIG += testcase
+TARGET = tst_qdeclarativeimageprovider
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeimageprovider.cpp
@@ -12,4 +11,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private network testlib
diff --git a/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro b/tests/auto/declarative/qdeclarativeincubator/qdeclarativeincubator.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative network widgets
+CONFIG += testcase
+TARGET = tst_qdeclarativeincubator
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeincubator.cpp \
@@ -10,4 +10,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private network widgets testlib
diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
@@ -1,5 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative widgets
+CONFIG += testcase
+TARGET = tst_qdeclarativeinfo
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeinfo.cpp
@@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 CONFIG += parallel_test
 #temporary
 CONFIG += insignificant_test
-QT += core-private gui-private declarative-private
+QT += core-private gui-private declarative-private widgets testlib
diff --git a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+CONFIG += testcase
+TARGET = tst_qdeclarativeinstruction
 SOURCES += tst_qdeclarativeinstruction.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 CONFIG += parallel_test
 
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
@@ -1,6 +1,5 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-QT += network
+CONFIG += testcase
+TARGET = tst_qdeclarativelanguage
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativelanguage.cpp \
@@ -16,4 +15,4 @@ importFiles.path = .
 DEPLOYMENT += importFiles
 
 CONFIG += parallel_test
-QT += core-private gui-private v8-private declarative-private
+QT += core-private gui-private v8-private declarative-private network testlib