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: I3f49fd3b79899eff1d6ad9458143f34419026276 Reviewed-on: http://codereview.qt-project.org/6286 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-10-10 14:59:27 +10:00
parent 12b2988137
commit 344364e99b
43 changed files with 129 additions and 104 deletions
--- a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro
+++ b/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qabstractvideobuffer

-QT += core multimedia-private
+QT += core multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qabstractvideobuffer.cpp
--- a/tests/auto/qabstractvideosurface/qabstractvideosurface.pro
+++ b/tests/auto/qabstractvideosurface/qabstractvideosurface.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qabstractvideosurface

-QT += core multimedia-private
+QT += core multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qabstractvideosurface.cpp
--- a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
+++ b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qaudiocapturesource

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qaudiocapturesource.cpp
--- a/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro
+++ b/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
+TARGET = tst_qaudiodeviceinfo

-QT += core multimedia-private
+QT += core multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 # This is more of a system test
-CONFIG -= testcase
+# CONFIG += testcase

 SOURCES += tst_qaudiodeviceinfo.cpp

--- a/tests/auto/qaudioformat/qaudioformat.pro
+++ b/tests/auto/qaudioformat/qaudioformat.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qaudioformat

-QT += core multimedia-private
+QT += core multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qaudioformat.cpp
--- a/tests/auto/qaudioinput/qaudioinput.pro
+++ b/tests/auto/qaudioinput/qaudioinput.pro
@@ -1,14 +1,12 @@
-load(qttest_p4)
+TARGET = tst_qaudioinput

-QT += core multimedia-private
+QT += core multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 # This is more of a system test
-CONFIG -= testcase
+# CONFIG += testcase

 DEFINES += SRCDIR=\\\"$$PWD/\\\"

 HEADERS += wavheader.h
 SOURCES += wavheader.cpp tst_qaudioinput.cpp
-
-maemo*:CONFIG += insignificant_test
--- a/tests/auto/qaudiooutput/qaudiooutput.pro
+++ b/tests/auto/qaudiooutput/qaudiooutput.pro
@@ -1,14 +1,12 @@
-load(qttest_p4)
+TARGET = tst_qaudiooutput

-QT += core multimedia-private
+QT += core multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 # This is more of a system test
-CONFIG -= testcase
+# CONFIG += testcase

 DEFINES += SRCDIR=\\\"$$PWD/\\\"

 HEADERS += wavheader.h
 SOURCES += wavheader.cpp tst_qaudiooutput.cpp
-
-maemo*:CONFIG += insignificant_test
--- a/tests/auto/qcamera/qcamera.pro
+++ b/tests/auto/qcamera/qcamera.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcamera

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 include (../qmultimedia_common/mock.pri)
--- a/tests/auto/qcamerabackend/qcamerabackend.pro
+++ b/tests/auto/qcamerabackend/qcamerabackend.pro
@@ -1,11 +1,9 @@
-load(qttest_p4)
+TARGET = tst_qcamerabackend

-QT += multimedia-private multimediawidgets-private
+QT += multimedia-private multimediawidgets-private testlib
 CONFIG += no_private_qt_headers_warning

 # This is more of a system test
-CONFIG -= testcase
+# CONFIG += testcase

 SOURCES += tst_qcamerabackend.cpp
-
-maemo*:CONFIG += insignificant_test
--- a/tests/auto/qcameraimagecapture/qcameraimagecapture.pro
+++ b/tests/auto/qcameraimagecapture/qcameraimagecapture.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcameraimagecapture

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += \
--- a/tests/auto/qcameraviewfinder/qcameraviewfinder.pro
+++ b/tests/auto/qcameraviewfinder/qcameraviewfinder.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcameraviewfinder

-QT += multimedia-private multimediawidgets-private
+QT += multimedia-private multimediawidgets-private testlib
 CONFIG += no_private_qt_headers_warning

 include (../qmultimedia_common/mock.pri)
--- a/tests/auto/qcamerawidgets/qcamerawidgets.pro
+++ b/tests/auto/qcamerawidgets/qcamerawidgets.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qcamerawidgets

-QT += multimedia-private multimediawidgets-private
+QT += multimedia-private multimediawidgets-private testlib
 CONFIG += no_private_qt_headers_warning

 include (../qmultimedia_common/mock.pri)
--- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdeclarativeaudio

-QT += multimedia-private declarative
+QT += multimedia-private declarative testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += \
--- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qdeclarativevideo

-QT += multimedia-private declarative
+QT += multimedia-private declarative testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += \
--- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qgraphicsvideoitem

-QT += multimedia-private multimediawidgets-private
+QT += multimedia-private multimediawidgets-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qgraphicsvideoitem.cpp
--- a/tests/auto/qmediabindableinterface/qmediabindableinterface.pro
+++ b/tests/auto/qmediabindableinterface/qmediabindableinterface.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediabindableinterface

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += \
--- a/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro
+++ b/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediacontainercontrol

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediacontainercontrol.cpp
--- a/tests/auto/qmediacontent/qmediacontent.pro
+++ b/tests/auto/qmediacontent/qmediacontent.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediacontent

-QT += multimedia-private network
+QT += multimedia-private network testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediacontent.cpp
--- a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
+++ b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaimageviewer

-QT += multimedia-private network
+QT += multimedia-private network testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaimageviewer.cpp
--- a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
+++ b/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaimageviewerwidgets

-QT += multimedia-private multimediawidgets-private network
+QT += multimedia-private multimediawidgets-private network testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaimageviewerwidgets.cpp
--- a/tests/auto/qmediaobject/qmediaobject.pro
+++ b/tests/auto/qmediaobject/qmediaobject.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaobject

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 include (../qmultimedia_common/mockrecorder.pri)
--- a/tests/auto/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/qmediaplayer/qmediaplayer.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaplayer

-QT += network multimedia-private
+QT += network multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += tst_qmediaplayer.h
--- a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro
@@ -1,14 +1,12 @@
-load(qttest_p4)
+TARGET = tst_qmediaplayerbackend

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 # This is more of a system test
-CONFIG -= testcase
+# CONFIG += testcase

 DEFINES += TESTDATA_DIR=\\\"$$PWD/\\\"

 SOURCES += \
    tst_qmediaplayerbackend.cpp
-
-maemo*:CONFIG += insignificant_test
--- a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro
+++ b/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaplayerwidgets

-QT += network multimedia-private multimediawidgets-private
+QT += network multimedia-private multimediawidgets-private testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += tst_qmediaplayerwidgets.h
--- a/tests/auto/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro
@@ -1,11 +1,12 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaplaylist

 # temporarily blacklist test because is fails miserably
 CONFIG += insignificant_test

 include (../qmultimedia_common/mockplaylist.pri)

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 DEFINES += TESTDATA_DIR=\\\"$$PWD/\\\"
@@ -18,5 +19,3 @@ SOURCES += \
    $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.cpp

 INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u
-
-maemo*:CONFIG += insignificant_test
--- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+++ b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaplaylistnavigator

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaplaylistnavigator.cpp
--- a/tests/auto/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/qmediapluginloader/qmediapluginloader.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediapluginloader

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediapluginloader.cpp
--- a/tests/auto/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/qmediarecorder/qmediarecorder.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediarecorder

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 include (../qmultimedia_common/mock.pri)
--- a/tests/auto/qmediaresource/qmediaresource.pro
+++ b/tests/auto/qmediaresource/qmediaresource.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaresource

-QT += network multimedia-private
+QT += network multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaresource.cpp
--- a/tests/auto/qmediaservice/qmediaservice.pro
+++ b/tests/auto/qmediaservice/qmediaservice.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaservice

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaservice.cpp
--- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
+++ b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediaserviceprovider

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaserviceprovider.cpp
--- a/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro
+++ b/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediastreamscontrol

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += \
--- a/tests/auto/qmediatimerange/qmediatimerange.pro
+++ b/tests/auto/qmediatimerange/qmediatimerange.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmediatimerange

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediatimerange.cpp
--- a/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro
+++ b/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmetadatareadercontrol

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmetadatareadercontrol.cpp
--- a/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro
+++ b/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qmetadatawritercontrol

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmetadatawritercontrol.cpp
--- a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpaintervideosurface

-QT += multimedia-private multimediawidgets-private
+QT += multimedia-private multimediawidgets-private testlib
 CONFIG += no_private_qt_headers_warning
 contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
   QT += opengl
--- a/tests/auto/qradiotuner/qradiotuner.pro
+++ b/tests/auto/qradiotuner/qradiotuner.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qradiotuner

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 HEADERS += tst_qradiotuner.h
--- a/tests/auto/qsoundeffect/qsoundeffect.pro
+++ b/tests/auto/qsoundeffect/qsoundeffect.pro
@@ -1,10 +1,10 @@
-load(qttest_p4)
+TARGET = tst_qsoundeffect

-QT += core declarative multimedia-private
+QT += core declarative multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 # This is more of a system test
-CONFIG -= testcase
+# CONFIG += testcase

 SOURCES += tst_qsoundeffect.cpp

@@ -15,5 +15,3 @@ unix:!mac {
        DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
    }
 }
-
-maemo*:CONFIG += insignificant_test
--- a/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro
+++ b/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvideodevicecontrol

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qvideodevicecontrol.cpp
--- a/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro
+++ b/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvideoencodercontrol

-QT += multimedia-private
+QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += \
--- a/tests/auto/qvideoframe/qvideoframe.pro
+++ b/tests/auto/qvideoframe/qvideoframe.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvideoframe

-QT += core multimedia-private
+QT += core multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qvideoframe.cpp
--- a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro
+++ b/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvideosurfaceformat

-QT += core multimedia-private
+QT += core multimedia-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qvideosurfaceformat.cpp
--- a/tests/auto/qvideowidget/qvideowidget.pro
+++ b/tests/auto/qvideowidget/qvideowidget.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvideowidget

-QT += multimedia-private multimediawidgets-private
+QT += multimedia-private multimediawidgets-private testlib
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qvideowidget.cpp