From 344364e99bf5f5c549b867ed785a8f2415dc577c Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 10 Oct 2011 14:59:27 +1000 Subject: 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 Reviewed-by: Jason McDonald --- tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro | 5 +++-- tests/auto/qabstractvideosurface/qabstractvideosurface.pro | 5 +++-- tests/auto/qaudiocapturesource/qaudiocapturesource.pro | 5 +++-- tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro | 6 +++--- tests/auto/qaudioformat/qaudioformat.pro | 5 +++-- tests/auto/qaudioinput/qaudioinput.pro | 8 +++----- tests/auto/qaudiooutput/qaudiooutput.pro | 8 +++----- tests/auto/qcamera/qcamera.pro | 5 +++-- tests/auto/qcamerabackend/qcamerabackend.pro | 8 +++----- tests/auto/qcameraimagecapture/qcameraimagecapture.pro | 5 +++-- tests/auto/qcameraviewfinder/qcameraviewfinder.pro | 5 +++-- tests/auto/qcamerawidgets/qcamerawidgets.pro | 5 +++-- tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro | 5 +++-- tests/auto/qdeclarativevideo/qdeclarativevideo.pro | 5 +++-- tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro | 5 +++-- tests/auto/qmediabindableinterface/qmediabindableinterface.pro | 5 +++-- tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro | 5 +++-- tests/auto/qmediacontent/qmediacontent.pro | 5 +++-- tests/auto/qmediaimageviewer/qmediaimageviewer.pro | 5 +++-- tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro | 5 +++-- tests/auto/qmediaobject/qmediaobject.pro | 5 +++-- tests/auto/qmediaplayer/qmediaplayer.pro | 5 +++-- tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro | 8 +++----- tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro | 5 +++-- tests/auto/qmediaplaylist/qmediaplaylist.pro | 7 +++---- tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro | 5 +++-- tests/auto/qmediapluginloader/qmediapluginloader.pro | 5 +++-- tests/auto/qmediarecorder/qmediarecorder.pro | 5 +++-- tests/auto/qmediaresource/qmediaresource.pro | 5 +++-- tests/auto/qmediaservice/qmediaservice.pro | 5 +++-- tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro | 5 +++-- tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro | 5 +++-- tests/auto/qmediatimerange/qmediatimerange.pro | 5 +++-- tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro | 5 +++-- tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro | 5 +++-- tests/auto/qpaintervideosurface/qpaintervideosurface.pro | 5 +++-- tests/auto/qradiotuner/qradiotuner.pro | 5 +++-- tests/auto/qsoundeffect/qsoundeffect.pro | 8 +++----- tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro | 5 +++-- tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro | 5 +++-- tests/auto/qvideoframe/qvideoframe.pro | 5 +++-- tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro | 5 +++-- tests/auto/qvideowidget/qvideowidget.pro | 5 +++-- 43 files changed, 129 insertions(+), 104 deletions(-) diff --git a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro index d6c7a07..dfb7e5d 100644 --- 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 diff --git a/tests/auto/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/qabstractvideosurface/qabstractvideosurface.pro index d580a0e..c1718a6 100644 --- 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 diff --git a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro index 9a53b54..1d0c2e2 100644 --- 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 diff --git a/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro index 0d66771..ffe9829 100644 --- 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 diff --git a/tests/auto/qaudioformat/qaudioformat.pro b/tests/auto/qaudioformat/qaudioformat.pro index 10b962e..59ba5c3 100644 --- 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 diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/qaudioinput/qaudioinput.pro index 446315f..b70c6ee 100644 --- 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 diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/qaudiooutput/qaudiooutput.pro index 4a02672..e3b5050 100644 --- 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 diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/qcamera/qcamera.pro index 75a9200..c697545 100644 --- 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) diff --git a/tests/auto/qcamerabackend/qcamerabackend.pro b/tests/auto/qcamerabackend/qcamerabackend.pro index 70206b2..9eb79fb 100644 --- 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 diff --git a/tests/auto/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/qcameraimagecapture/qcameraimagecapture.pro index 7f37061..fdd2cf5 100644 --- 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 += \ diff --git a/tests/auto/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/qcameraviewfinder/qcameraviewfinder.pro index 2543b3f..a53729a 100644 --- 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) diff --git a/tests/auto/qcamerawidgets/qcamerawidgets.pro b/tests/auto/qcamerawidgets/qcamerawidgets.pro index b97232a..f8de4af 100644 --- 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) diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro index 923e3ba..35f1173 100644 --- 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 += \ diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro index 02aface..cd1c615 100644 --- 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 += \ diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro index cd88f4b..d3514cf 100644 --- 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 diff --git a/tests/auto/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/qmediabindableinterface/qmediabindableinterface.pro index 530d550..366a4e6 100644 --- 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 += \ diff --git a/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro index 5408840..90dcbf8 100644 --- 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 diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/qmediacontent/qmediacontent.pro index 493a1d9..d55218d 100644 --- 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 diff --git a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro index 50b01f1..4724f61 100644 --- 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 diff --git a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro b/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro index 95cb875..a37ae88 100644 --- 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 diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/qmediaobject/qmediaobject.pro index b164adb..01ee43e 100644 --- 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) diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro index dae3dde..f770f1e 100644 --- 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 diff --git a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro index c86afc4..fdd941d 100644 --- 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 diff --git a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro index 61c9c2b..ec246ab 100644 --- 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 diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro index 346251a..d028343 100644 --- 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 diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro index 33c4336..305d63b 100644 --- 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 diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/qmediapluginloader/qmediapluginloader.pro index eb1fd96..f5947c6 100644 --- 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 diff --git a/tests/auto/qmediarecorder/qmediarecorder.pro b/tests/auto/qmediarecorder/qmediarecorder.pro index b7ca93d..1efaba0 100644 --- 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) diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/qmediaresource/qmediaresource.pro index 4d8cf5e..b6c1e71 100644 --- 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 diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro index 7fc2305..9ae2c54 100644 --- 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 diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro index f0b00a1..d74c936 100644 --- 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 diff --git a/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro b/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro index ddbd37f..d271671 100644 --- 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 += \ diff --git a/tests/auto/qmediatimerange/qmediatimerange.pro b/tests/auto/qmediatimerange/qmediatimerange.pro index a8a36d7..0b66260 100644 --- 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 diff --git a/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro index 7cf0247..0793a80 100644 --- 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 diff --git a/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro index e172d76..eef5d32 100644 --- 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 diff --git a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro index 7ced1d3..d56a384 100644 --- 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 diff --git a/tests/auto/qradiotuner/qradiotuner.pro b/tests/auto/qradiotuner/qradiotuner.pro index f5c45e6..3d3a21f 100644 --- 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 diff --git a/tests/auto/qsoundeffect/qsoundeffect.pro b/tests/auto/qsoundeffect/qsoundeffect.pro index 8c5ef70..4d7f083 100644 --- 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 diff --git a/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro b/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro index c0f5b37..29bd81f 100644 --- 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 diff --git a/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro b/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro index e41404c..ad14a25 100644 --- 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 += \ diff --git a/tests/auto/qvideoframe/qvideoframe.pro b/tests/auto/qvideoframe/qvideoframe.pro index c129025..cfd84a2 100644 --- 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 diff --git a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro index 97d576f..a0e6266 100644 --- 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 diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro index a6f8a66..4e44a1d 100644 --- 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 -- cgit v1.2.3