diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/auto.pro | 16 | ||||
-rw-r--r-- | tests/auto/integration/integration.pro | 3 | ||||
-rw-r--r-- | tests/auto/integration/multimedia.pro | 9 | ||||
-rw-r--r-- | tests/auto/integration/qaudioinput/qaudioinput.pro (renamed from tests/auto/qaudioinput/qaudioinput.pro) | 0 | ||||
-rwxr-xr-x | tests/auto/integration/qaudioinput/tst_qaudioinput.cpp (renamed from tests/auto/qaudioinput/tst_qaudioinput.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/integration/qaudioinput/wavheader.cpp (renamed from tests/auto/qaudioinput/wavheader.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/integration/qaudioinput/wavheader.h (renamed from tests/auto/qaudioinput/wavheader.h) | 0 | ||||
-rw-r--r-- | tests/auto/integration/qaudiooutput/qaudiooutput.pro (renamed from tests/auto/qaudiooutput/qaudiooutput.pro) | 0 | ||||
-rwxr-xr-x | tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp (renamed from tests/auto/qaudiooutput/tst_qaudiooutput.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/integration/qaudiooutput/wavheader.cpp (renamed from tests/auto/qaudiooutput/wavheader.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/integration/qaudiooutput/wavheader.h (renamed from tests/auto/qaudiooutput/wavheader.h) | 0 | ||||
-rw-r--r-- | tests/auto/integration/qcamerabackend/qcamerabackend.pro (renamed from tests/auto/qcamerabackend/qcamerabackend.pro) | 0 | ||||
-rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp (renamed from tests/auto/qcamerabackend/tst_qcamerabackend.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro (renamed from tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro) | 0 | ||||
-rw-r--r-- | tests/auto/integration/qmediaplayerbackend/testdata/test.wav (renamed from tests/auto/qmediaplayerbackend/testdata/test.wav) | bin | 88232 -> 88232 bytes | |||
-rw-r--r-- | tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp (renamed from tests/auto/qmediaplayerbackend/tst_qmediaplayerbackend.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/integration/qsoundeffect/qsoundeffect.pro (renamed from tests/auto/qsoundeffect/qsoundeffect.pro) | 0 | ||||
-rw-r--r-- | tests/auto/integration/qsoundeffect/test.wav (renamed from tests/auto/qsoundeffect/test.wav) | bin | 38316 -> 38316 bytes | |||
-rw-r--r-- | tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp (renamed from tests/auto/qsoundeffect/tst_qsoundeffect.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro | 10 | ||||
-rw-r--r-- | tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp | 408 | ||||
-rw-r--r-- | tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro | 7 | ||||
-rw-r--r-- | tests/auto/qvideodevicecontrol/tst_qvideodevicecontrol.cpp | 110 | ||||
-rw-r--r-- | tests/auto/unit/multimedia.pro (renamed from tests/auto/multimedia.pro) | 37 | ||||
-rw-r--r-- | tests/auto/unit/multimediawidgets.pro (renamed from tests/auto/multimediawidgets.pro) | 8 | ||||
-rw-r--r-- | tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro (renamed from tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qabstractvideobuffer/tst_qabstractvideobuffer.cpp (renamed from tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro (renamed from tests/auto/qabstractvideosurface/qabstractvideosurface.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp (renamed from tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro (renamed from tests/auto/qaudiocapturesource/qaudiocapturesource.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qaudiocapturesource/tst_qaudiocapturesource.cpp (renamed from tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qaudiodeviceinfo/qaudiodeviceinfo.pro (renamed from tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp (renamed from tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qaudioformat/qaudioformat.pro (renamed from tests/auto/qaudioformat/qaudioformat.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qaudioformat/tst_qaudioformat.cpp (renamed from tests/auto/qaudioformat/tst_qaudioformat.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qaudionamespace/qaudionamespace.pro (renamed from tests/auto/qaudionamespace/qaudionamespace.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qaudionamespace/tst_qaudionamespace.cpp (renamed from tests/auto/qaudionamespace/tst_qaudionamespace.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qcamera/qcamera.pro (renamed from tests/auto/qcamera/qcamera.pro) | 2 | ||||
-rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp (renamed from tests/auto/qcamera/tst_qcamera.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro (renamed from tests/auto/qcameraimagecapture/qcameraimagecapture.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp (renamed from tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro (renamed from tests/auto/qcameraviewfinder/qcameraviewfinder.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp (renamed from tests/auto/qcameraviewfinder/tst_qcameraviewfinder.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qcamerawidgets/qcamerawidgets.pro (renamed from tests/auto/qcamerawidgets/qcamerawidgets.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp (renamed from tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro (renamed from tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp (renamed from tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro (renamed from tests/auto/qdeclarativevideo/qdeclarativevideo.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qdeclarativevideo/tst_qdeclarativevideo.cpp (renamed from tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro (renamed from tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp (renamed from tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro (renamed from tests/auto/qmediabindableinterface/qmediabindableinterface.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp (renamed from tests/auto/qmediabindableinterface/tst_qmediabindableinterface.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro (renamed from tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediacontainercontrol/tst_qmediacontainercontrol.cpp (renamed from tests/auto/qmediacontainercontrol/tst_qmediacontainercontrol.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediacontent/qmediacontent.pro (renamed from tests/auto/qmediacontent/qmediacontent.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediacontent/tst_qmediacontent.cpp (renamed from tests/auto/qmediacontent/tst_qmediacontent.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaimageviewer/images.qrc (renamed from tests/auto/qmediaimageviewer/images.qrc) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaimageviewer/images/coverart.png (renamed from tests/auto/qmediaimageviewer/images/coverart.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | tests/auto/unit/qmediaimageviewer/images/image.jpg (renamed from tests/auto/qmediaimageviewer/images/image.jpg) | bin | 2045 -> 2045 bytes | |||
-rw-r--r-- | tests/auto/unit/qmediaimageviewer/images/image.png (renamed from tests/auto/qmediaimageviewer/images/image.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | tests/auto/unit/qmediaimageviewer/images/invalid.png (renamed from tests/auto/qmediaimageviewer/images/invalid.png) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaimageviewer/images/poster.png (renamed from tests/auto/qmediaimageviewer/images/poster.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | tests/auto/unit/qmediaimageviewer/qmediaimageviewer.pro (renamed from tests/auto/qmediaimageviewer/qmediaimageviewer.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp (renamed from tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaimageviewerwidgets/images.qrc (renamed from tests/auto/qmediaimageviewerwidgets/images.qrc) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaimageviewerwidgets/images/image.png (renamed from tests/auto/qmediaimageviewerwidgets/images/image.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | tests/auto/unit/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro (renamed from tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp (renamed from tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaobject/main.cpp (renamed from tests/auto/qmediaobject/main.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaobject/qmediaobject.pro (renamed from tests/auto/qmediaobject/qmediaobject.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.cpp (renamed from tests/auto/qmediaobject/tst_qmediaobject.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.h (renamed from tests/auto/qmediaobject/tst_qmediaobject.h) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qmediaplayer/main.cpp (renamed from tests/auto/qmediaplayer/main.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplayer/qmediaplayer.pro (renamed from tests/auto/qmediaplayer/qmediaplayer.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp (renamed from tests/auto/qmediaplayer/tst_qmediaplayer.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qmediaplayer/tst_qmediaplayer.h (renamed from tests/auto/qmediaplayer/tst_qmediaplayer.h) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qmediaplayerwidgets/main.cpp (renamed from tests/auto/qmediaplayerwidgets/main.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro (renamed from tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp (renamed from tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.h (renamed from tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplaylist/qmediaplaylist.pro (renamed from tests/auto/qmediaplaylist/qmediaplaylist.pro) | 3 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplaylist/testdata/test.m3u (renamed from tests/auto/qmediaplaylist/testdata/test.m3u) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplaylist/testdata/testfile (renamed from tests/auto/qmediaplaylist/testdata/testfile) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplaylist/testdata/testfile2#suffix (renamed from tests/auto/qmediaplaylist/testdata/testfile2#suffix) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp (renamed from tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp) | 12 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro (renamed from tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp (renamed from tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediapluginloader/qmediapluginloader.pro (renamed from tests/auto/qmediapluginloader/qmediapluginloader.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp (renamed from tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qmediarecorder/main.cpp (renamed from tests/auto/qmediarecorder/main.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediarecorder/qmediarecorder.pro (renamed from tests/auto/qmediarecorder/qmediarecorder.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp (renamed from tests/auto/qmediarecorder/tst_qmediarecorder.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qmediarecorder/tst_qmediarecorder.h (renamed from tests/auto/qmediarecorder/tst_qmediarecorder.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaresource/qmediaresource.pro (renamed from tests/auto/qmediaresource/qmediaresource.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaresource/tst_qmediaresource.cpp (renamed from tests/auto/qmediaresource/tst_qmediaresource.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaservice/qmediaservice.pro (renamed from tests/auto/qmediaservice/qmediaservice.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaservice/tst_qmediaservice.cpp (renamed from tests/auto/qmediaservice/tst_qmediaservice.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro (renamed from tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp (renamed from tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediatimerange/qmediatimerange.pro (renamed from tests/auto/qmediatimerange/qmediatimerange.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp (renamed from tests/auto/qmediatimerange/tst_qmediatimerange.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro (renamed from tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp (renamed from tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro (renamed from tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp (renamed from tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mock.pri (renamed from tests/auto/qmultimedia_common/mock.pri) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h (renamed from tests/auto/qmultimedia_common/mockaudioencodercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h (renamed from tests/auto/qmultimedia_common/mockaudioendpointselector.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcamera.pri (renamed from tests/auto/qmultimedia_common/mockcamera.pri) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameracapturebuffercontrol.h (renamed from tests/auto/qmultimedia_common/mockcameracapturebuffercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h (renamed from tests/auto/qmultimedia_common/mockcameracapturedestinationcontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameracontrol.h (renamed from tests/auto/qmultimedia_common/mockcameracontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h (renamed from tests/auto/qmultimedia_common/mockcameraexposurecontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h (renamed from tests/auto/qmultimedia_common/mockcameraflashcontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h (renamed from tests/auto/qmultimedia_common/mockcamerafocuscontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h (renamed from tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameraimageprocessingcontrol.h (renamed from tests/auto/qmultimedia_common/mockcameraimageprocessingcontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h (renamed from tests/auto/qmultimedia_common/mockcameralockscontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameraservice.h (renamed from tests/auto/qmultimedia_common/mockcameraservice.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcontainer.pri (renamed from tests/auto/qmultimedia_common/mockcontainer.pri) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h (renamed from tests/auto/qmultimedia_common/mockimageencodercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h (renamed from tests/auto/qmultimedia_common/mockmediacontainercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h (renamed from tests/auto/qmultimedia_common/mockmedianetworkaccesscontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaobject.h (renamed from tests/auto/qmultimedia_common/mockmediaobject.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaplayercontrol.h (renamed from tests/auto/qmultimedia_common/mockmediaplayercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h (renamed from tests/auto/qmultimedia_common/mockmediaplayerservice.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h (renamed from tests/auto/qmultimedia_common/mockmediaplaylistcontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h (renamed from tests/auto/qmultimedia_common/mockmediaplaylistsourcecontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediarecordercontrol.h (renamed from tests/auto/qmultimedia_common/mockmediarecordercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h (renamed from tests/auto/qmultimedia_common/mockmediarecorderservice.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaservice.h (renamed from tests/auto/qmultimedia_common/mockmediaservice.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h (renamed from tests/auto/qmultimedia_common/mockmediaserviceprovider.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h (renamed from tests/auto/qmultimedia_common/mockmediastreamscontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h (renamed from tests/auto/qmultimedia_common/mockmetadatareadercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h (renamed from tests/auto/qmultimedia_common/mockmetadatawritercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockplayer.pri (renamed from tests/auto/qmultimedia_common/mockplayer.pri) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockplaylist.pri (renamed from tests/auto/qmultimedia_common/mockplaylist.pri) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockplaylistservice.h (renamed from tests/auto/qmultimedia_common/mockplaylistservice.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockradio.pri (renamed from tests/auto/qmultimedia_common/mockradio.pri) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockradiodatacontrol.h (renamed from tests/auto/qmultimedia_common/mockradiodatacontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockradiotunercontrol.h (renamed from tests/auto/qmultimedia_common/mockradiotunercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h (renamed from tests/auto/qmultimedia_common/mockreadonlyplaylistprovider.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockrecorder.pri (renamed from tests/auto/qmultimedia_common/mockrecorder.pri) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockvideo.pri (renamed from tests/auto/qmultimedia_common/mockvideo.pri) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h (renamed from tests/auto/qmultimedia_common/mockvideoencodercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockvideorenderercontrol.h (renamed from tests/auto/qmultimedia_common/mockvideorenderercontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockvideosurface.h (renamed from tests/auto/qmultimedia_common/mockvideosurface.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockvideowindowcontrol.h (renamed from tests/auto/qmultimedia_common/mockvideowindowcontrol.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro (renamed from tests/auto/qpaintervideosurface/qpaintervideosurface.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp (renamed from tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qradiodata/main.cpp (renamed from tests/auto/qradiodata/main.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qradiodata/qradiodata.pro (renamed from tests/auto/qradiodata/qradiodata.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qradiodata/tst_qradiodata.cpp (renamed from tests/auto/qradiodata/tst_qradiodata.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qradiodata/tst_qradiodata.h (renamed from tests/auto/qradiodata/tst_qradiodata.h) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qradiotuner/main.cpp (renamed from tests/auto/qradiotuner/main.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qradiotuner/qradiotuner.pro (renamed from tests/auto/qradiotuner/qradiotuner.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qradiotuner/tst_qradiotuner.cpp (renamed from tests/auto/qradiotuner/tst_qradiotuner.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qradiotuner/tst_qradiotuner.h (renamed from tests/auto/qradiotuner/tst_qradiotuner.h) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro (renamed from tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp (renamed from tests/auto/qvideoencodercontrol/tst_qvideoencodercontrol.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qvideoframe/qvideoframe.pro (renamed from tests/auto/qvideoframe/qvideoframe.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qvideoframe/tst_qvideoframe.cpp (renamed from tests/auto/qvideoframe/tst_qvideoframe.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro (renamed from tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp (renamed from tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qvideowidget/qvideowidget.pro (renamed from tests/auto/qvideowidget/qvideowidget.pro) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qvideowidget/tst_qvideowidget.cpp (renamed from tests/auto/qvideowidget/tst_qvideowidget.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav (renamed from tests/auto/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav) | bin | 4044 -> 4044 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav (renamed from tests/auto/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav) | bin | 4044 -> 4044 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav (renamed from tests/auto/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav) | bin | 4044 -> 4044 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/empty.wav (renamed from tests/auto/qwavedecoder/data/empty.wav) | 0 | ||||
-rwxr-xr-x | tests/auto/unit/qwavedecoder/data/gendata.sh (renamed from tests/auto/qwavedecoder/data/gendata.sh) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le.wav (renamed from tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav) | bin | 22094 -> 22094 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_1_16_8000_le.wav (renamed from tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav) | bin | 4044 -> 4044 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_1_32_44100_le.wav (renamed from tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav) | bin | 44180 -> 44180 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_1_32_8000_le.wav (renamed from tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav) | bin | 8080 -> 8080 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_1_8_44100.wav (renamed from tests/auto/qwavedecoder/data/isawav_1_8_44100.wav) | bin | 11069 -> 11069 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_1_8_8000.wav (renamed from tests/auto/qwavedecoder/data/isawav_1_8_8000.wav) | bin | 2044 -> 2044 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_2_16_44100_be.wav (renamed from tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav) | bin | 44144 -> 44144 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_2_16_8000_be.wav (renamed from tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav) | bin | 8044 -> 8044 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_2_32_44100_be.wav (renamed from tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav) | bin | 88280 -> 88280 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_2_32_8000_be.wav (renamed from tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav) | bin | 16080 -> 16080 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_2_8_44100.wav (renamed from tests/auto/qwavedecoder/data/isawav_2_8_44100.wav) | bin | 22094 -> 22094 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/isawav_2_8_8000.wav (renamed from tests/auto/qwavedecoder/data/isawav_2_8_8000.wav) | bin | 4044 -> 4044 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/nosampledata.wav (renamed from tests/auto/qwavedecoder/data/nosampledata.wav) | bin | 44 -> 44 bytes | |||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/notawav.wav (renamed from tests/auto/qwavedecoder/data/notawav.wav) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qwavedecoder/data/onebyte.wav (renamed from tests/auto/qwavedecoder/data/onebyte.wav) | 0 | ||||
-rw-r--r-- | tests/auto/unit/qwavedecoder/qwavedecoder.pro (renamed from tests/auto/qwavedecoder/qwavedecoder.pro) | 4 | ||||
-rw-r--r-- | tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp (renamed from tests/auto/qwavedecoder/tst_qwavedecoder.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/unit/unit.pro | 4 |
190 files changed, 38 insertions, 595 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index affd4e3d2..2c368ea22 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,12 +1,4 @@ -TEMPLATE = subdirs - -SUBDIRS += multimedia.pro -contains(QT_CONFIG,multimediawidgets): SUBDIRS += multimediawidgets.pro - -# These autotests consist of things such as static code checks -# which require that the autotest is run on the same machine -# doing the build - i.e. cross-compilation is not allowed. -win32|mac|linux-g++* { - # NOTE: Disabled until we have established which tests fall into this category - # !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro -} +TEMPLATE=subdirs +SUBDIRS += \ + unit \ + integration diff --git a/tests/auto/integration/integration.pro b/tests/auto/integration/integration.pro new file mode 100644 index 000000000..c61fbd4ee --- /dev/null +++ b/tests/auto/integration/integration.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +SUBDIRS += multimedia.pro diff --git a/tests/auto/integration/multimedia.pro b/tests/auto/integration/multimedia.pro new file mode 100644 index 000000000..f09ce9410 --- /dev/null +++ b/tests/auto/integration/multimedia.pro @@ -0,0 +1,9 @@ + +TEMPLATE = subdirs +SUBDIRS += \ + qaudioinput \ + qaudiooutput \ + qmediaplayerbackend \ + qcamerabackend \ + qsoundeffect + diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro index b70c6ee48..b70c6ee48 100644 --- a/tests/auto/qaudioinput/qaudioinput.pro +++ b/tests/auto/integration/qaudioinput/qaudioinput.pro diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp index 30ed2e10a..30ed2e10a 100755 --- a/tests/auto/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp diff --git a/tests/auto/qaudioinput/wavheader.cpp b/tests/auto/integration/qaudioinput/wavheader.cpp index 26fcd6f98..26fcd6f98 100755 --- a/tests/auto/qaudioinput/wavheader.cpp +++ b/tests/auto/integration/qaudioinput/wavheader.cpp diff --git a/tests/auto/qaudioinput/wavheader.h b/tests/auto/integration/qaudioinput/wavheader.h index 4136da027..4136da027 100755 --- a/tests/auto/qaudioinput/wavheader.h +++ b/tests/auto/integration/qaudioinput/wavheader.h diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/integration/qaudiooutput/qaudiooutput.pro index e3b50509e..e3b50509e 100644 --- a/tests/auto/qaudiooutput/qaudiooutput.pro +++ b/tests/auto/integration/qaudiooutput/qaudiooutput.pro diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index 8810a5969..8810a5969 100755 --- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp diff --git a/tests/auto/qaudiooutput/wavheader.cpp b/tests/auto/integration/qaudiooutput/wavheader.cpp index 26fcd6f98..26fcd6f98 100755 --- a/tests/auto/qaudiooutput/wavheader.cpp +++ b/tests/auto/integration/qaudiooutput/wavheader.cpp diff --git a/tests/auto/qaudiooutput/wavheader.h b/tests/auto/integration/qaudiooutput/wavheader.h index 5212eca67..5212eca67 100755 --- a/tests/auto/qaudiooutput/wavheader.h +++ b/tests/auto/integration/qaudiooutput/wavheader.h diff --git a/tests/auto/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro index 147885ffc..147885ffc 100644 --- a/tests/auto/qcamerabackend/qcamerabackend.pro +++ b/tests/auto/integration/qcamerabackend/qcamerabackend.pro diff --git a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 25e960d44..25e960d44 100644 --- a/tests/auto/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp diff --git a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro index fdd941d69..fdd941d69 100644 --- a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro +++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro diff --git a/tests/auto/qmediaplayerbackend/testdata/test.wav b/tests/auto/integration/qmediaplayerbackend/testdata/test.wav Binary files differindex 4dd022661..4dd022661 100644 --- a/tests/auto/qmediaplayerbackend/testdata/test.wav +++ b/tests/auto/integration/qmediaplayerbackend/testdata/test.wav diff --git a/tests/auto/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index 29e70c24d..29e70c24d 100644 --- a/tests/auto/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp diff --git a/tests/auto/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro index 4d7f083b1..4d7f083b1 100644 --- a/tests/auto/qsoundeffect/qsoundeffect.pro +++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro diff --git a/tests/auto/qsoundeffect/test.wav b/tests/auto/integration/qsoundeffect/test.wav Binary files differindex e4088a973..e4088a973 100644 --- a/tests/auto/qsoundeffect/test.wav +++ b/tests/auto/integration/qsoundeffect/test.wav diff --git a/tests/auto/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index b3797625d..b3797625d 100644 --- a/tests/auto/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp diff --git a/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro b/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro deleted file mode 100644 index d27167197..000000000 --- a/tests/auto/qmediastreamscontrol/qmediastreamscontrol.pro +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG += testcase -TARGET = tst_qmediastreamscontrol - -QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning - -SOURCES += \ - tst_qmediastreamscontrol.cpp - -include(../multimedia_common.pri) diff --git a/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp b/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp deleted file mode 100644 index d72869185..000000000 --- a/tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp +++ /dev/null @@ -1,408 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//TESTED_COMPONENT=src/multimedia - -#include <QtCore/QString> -#include <QtTest/QtTest> -#include <QtCore/QCoreApplication> - - -#include <qmediaplayercontrol.h> -#include <qmediaservice.h> - -#include <qmediastreamscontrol.h> - -#include <QtGui/QImage> -#include <QtCore/QPointer> - -QT_USE_NAMESPACE - - -#define WAIT_FOR_CONDITION(a,e) \ - for (int _i = 0; _i < 500; _i += 1) { \ - if ((a) == (e)) break; \ - QTest::qWait(10);} - -class tst_qmediastreamscontrol : public QObject -{ - Q_OBJECT - -public: - tst_qmediastreamscontrol(); - -private Q_SLOTS: - void initTestCase(); - void cleanupTestCase(); - void control_iid(); - void control(); - void isActive(); - void streamCount(); - void streamsChanged(); - void metadata(); -}; - - - -class mediaStatusList : public QObject, public QList<QMediaStreamsControl::StreamType> -{ - Q_OBJECT -public slots: - void mediaStatus(QMediaStreamsControl::StreamType status) { - append(status); - } - -public: - mediaStatusList(QObject *obj, const char *aSignal) - : QObject() - { - QObject::connect(obj, aSignal, this, SLOT(mediaStatus(QMediaStreamsControl::StreamType))); - } -}; - -class QtTestMediaStreamsControl: public QMediaStreamsControl -{ -public: - QtTestMediaStreamsControl(QObject *parent = 0) - : QMediaStreamsControl(parent) - { - } - - int streamCount() - { - QList <StreamType> m_stype; - - return streams.count(); - } - void setStreamCount(int count) - { - streams.resize(count); - } - - StreamType streamType(int index) - { - return streams.at(index).type; - } - void setStreamType(int index, StreamType type) - { - streams[index].type = type; - } - - QVariant metaData(int index, QtMultimedia::MetaData key) - { - QtMultimedia::MetaData keys = key; - return keys; - } - - void setMetaData(int index, QtMultimedia::MetaData key, const QVariant &value) - { - streams[index].metaData.insert(key, value); - } - - bool isActive(int index) - { - return streams.at(index).active; - } - void setActive(int index, bool state) - { - streams[index].active = state; - } - - void setAudioOnlyContent() - { - mediaContent = audioOnlyContent; - - m_player->setMedia(*mediaContent); - } - - void setVideoOnlyContent() - { - mediaContent = videoOnlyContent; - duration = 60000; - - m_player->setMedia(*mediaContent); - } - - void setAudioVideoContent() - { - if (mediaContent == audioVideoContent) - { - mediaContent = audioVideoAltContent; - duration = 101840; - } - else - { - mediaContent = audioVideoContent; - duration = 141000; - } - - m_player->setMedia(*mediaContent); - } - - void setStreamingContent() - { - mediaContent = streamingContent; - - m_player->setMedia(*mediaContent); - } - - - -public: - struct Stream - { - Stream() : type(UnknownStream), active(false) {} - StreamType type; - QMap<QtMultimedia::MetaData, QVariant> metaData; - bool active; - }; - - QVector<Stream> streams; - QMediaContent* audioOnlyContent; - QMediaContent* videoOnlyContent; - QMediaContent* audioVideoContent; - QMediaContent* audioVideoAltContent; - QMediaContent* mediaContent; - QMediaContent* streamingContent; - - qint64 duration; - QMediaPlayer *m_player; - QVideoWidget *m_widget; - QWidget *m_windowWidget; - - -}; - -class QTestMediaStreamsControlA : public QMediaControl -{ - Q_OBJECT -}; - -#define QTestMediaStreamsControlA_iid "com.nokia.QTestMediaStreamsControlA" -Q_MEDIA_DECLARE_CONTROL(QTestMediaStreamsControlA, QTestMediaStreamsControlA_iid) - -class QTestMediaStreamsControlB : public QMediaControl -{ - Q_OBJECT -public: - QTestMediaStreamsControlB() - : QMediaControl(0) - ,ctrlA(0) - ,ctrlB(0) - ,ctrlC(0) {} - - bool isActive(int stream) - { - return 1; - } - - int ctrlA; - int ctrlB; - int ctrlC; -}; - -#define QTestMediaStreamsControlB_iid "com.nokia.QTestMediaStreamsControlB" -Q_MEDIA_DECLARE_CONTROL(QTestMediaStreamsControlB, QTestMediaStreamsControlB_iid) - - -class QTestMediaStreamsControlC : public QMediaControl -{ - Q_OBJECT -}; - -#define QTestMediaStreamsControlC_iid "com.nokia.QTestMediaStreamsControlC" -Q_MEDIA_DECLARE_CONTROL(QTestMediaStreamsControlC, QTestMediaStreamsControlC_iid) // Yes A. - -class QTestMediaStreamsControlD : public QMediaControl -{ - Q_OBJECT -}; - -#define QTestMediaStreamsControlD_iid "com.nokia.QTestMediaStreamsControlD" -Q_MEDIA_DECLARE_CONTROL(QTestMediaStreamsControlD, QTestMediaStreamsControlD_iid) - - -class QtTestMediaService : public QMediaService -{ - Q_OBJECT -public: - QtTestMediaService() - : QMediaService(0) - , refA(0) - , refB(0) - , refC(0) - { - } - - QMediaControl *requestControl(const char *name) - { - if (strcmp(name, QTestMediaStreamsControlA_iid) == 0) { - refA += 1; - - return &controlA; - } else if (strcmp(name, QTestMediaStreamsControlB_iid) == 0) { - refB += 1; - - return &controlB; - } else if (strcmp(name, QTestMediaStreamsControlC_iid) == 0) { - refA += 1; - - return &controlA; - } else { - return 0; - } - } - - void releaseControl(QMediaControl *control) - { - if (control == &controlA) - refA -= 1; - else if (control == &controlB) - refB -= 1; - else if (control == &controlC) - refC -= 1; - } - - using QMediaService::requestControl; - - int refA; - int refB; - int refC; - QTestMediaStreamsControlA controlA; - QTestMediaStreamsControlB controlB; - QTestMediaStreamsControlC controlC; -}; - - -tst_qmediastreamscontrol::tst_qmediastreamscontrol() -{ -} - -void tst_qmediastreamscontrol::initTestCase() -{ -} - -void tst_qmediastreamscontrol::cleanupTestCase() -{ -} - -void tst_qmediastreamscontrol::control_iid() -{ - - // Default implementation. - QCOMPARE(qmediacontrol_iid<QTestMediaStreamsControlA *>(), QTestMediaStreamsControlA_iid); - - // Partial template. - QVERIFY(qstrcmp(qmediacontrol_iid<QTestMediaStreamsControlA *>(), QTestMediaStreamsControlA_iid) == 0); -} - -void tst_qmediastreamscontrol::control() -{ - QtTestMediaService *service = new QtTestMediaService(); - QMediaStreamsControl *control = qobject_cast<QMediaStreamsControl *> - (service->requestControl("com.nokia.Qt.MediaStreamsControl/1.0")); - // QCOMPARE(control,service->controlA.objectName()); - QTestMediaStreamsControlA *controlA = (QTestMediaStreamsControlA *)service->requestControl("controlA"); - // QCOMPARE(controlA,service->controlA); - QVERIFY(service->requestControl<QTestMediaStreamsControlA *>()); - - service->releaseControl(controlA); - delete service; -} - -void tst_qmediastreamscontrol::isActive() -{ - QTestMediaStreamsControlB ser; - QVERIFY(ser.isActive(1)); - QtTestMediaStreamsControl m_active; - //setActive - m_active.setActive(1,1); - QVERIFY(m_active.isActive(1)); - //set InActive - m_active.setActive(2,0); - QVERIFY(!m_active.isActive(0)); -} - -//Returns the number of media streams. -void tst_qmediastreamscontrol::streamCount() -{ - QtTestMediaStreamsControl m_cnt; - m_cnt.setStreamType(0,QMediaStreamsControl::UnknownStream); - m_cnt.setStreamType(1,QMediaStreamsControl::VideoStream); - m_cnt.setStreamType(2,QMediaStreamsControl::AudioStream); - m_cnt.setStreamType(3,QMediaStreamsControl::SubPictureStream); - m_cnt.setStreamType(4,QMediaStreamsControl::DataStream); - m_cnt.setStreamCount(5); - QVERIFY(m_cnt.streamCount() == m_cnt.streams.count()); -} - -//The signal is emitted when the available streams list is changed. -void tst_qmediastreamscontrol::streamsChanged() -{ - QMediaPlayer *m_player = new QMediaPlayer(0); - QMediaStreamsControl* m_streamControl = (QMediaStreamsControl*) - (m_player->service()->requestControl(QTestMediaStreamsControlA_iid)); - - QMediaContent videoOnlyContent; - - m_player->setMedia(videoOnlyContent); - if (m_streamControl) { - QSignalSpy m_strm_lst_chgSpy(m_streamControl,SIGNAL(streamsChanged())); - QVERIFY(m_strm_lst_chgSpy.isValid()); - QVERIFY(m_strm_lst_chgSpy.isEmpty()); - WAIT_FOR_CONDITION(m_player->mediaStatus(),QMediaPlayer::LoadedMedia); - QVERIFY(m_streamControl->streamCount() == 1); - QVERIFY(m_strm_lst_chgSpy.count() == 1); - } - - delete m_player; - m_player = NULL; -} - -void tst_qmediastreamscontrol::metadata() -{ - QtTestMediaStreamsControl m_metadata; - m_metadata.metaData(1,QtMultimedia::AlbumArtist); - qDebug() << m_metadata.metaData(1,QtMultimedia::AlbumArtist); -} -QTEST_MAIN(tst_qmediastreamscontrol); - -#include "tst_qmediastreamscontrol.moc" diff --git a/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro b/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro deleted file mode 100644 index 29bd81fa9..000000000 --- a/tests/auto/qvideodevicecontrol/qvideodevicecontrol.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qvideodevicecontrol - -QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning - -SOURCES += tst_qvideodevicecontrol.cpp diff --git a/tests/auto/qvideodevicecontrol/tst_qvideodevicecontrol.cpp b/tests/auto/qvideodevicecontrol/tst_qvideodevicecontrol.cpp deleted file mode 100644 index 59d2546b3..000000000 --- a/tests/auto/qvideodevicecontrol/tst_qvideodevicecontrol.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//TESTED_COMPONENT=src/multimedia - -#include <QtTest/QtTest> -#include "qvideodevicecontrol.h" -class TestClass: public QVideoDeviceControl -{ - Q_OBJECT - -public: - TestClass(QObject *parent = 0 ):QVideoDeviceControl(parent) - { - - } - - ~TestClass(){} - - virtual int deviceCount() const { return 0; } - - QString deviceName(int index) const - { - QString str; - return str; - } - - QString deviceDescription(int index) const - { - QString str; - return str; - } - - QIcon deviceIcon(int index) const - { - QIcon icon; - return icon; - } - - int defaultDevice() const { return 0; } - int selectedDevice() const { return 0; } - - public Q_SLOTS: - void setSelectedDevice(int index) - { - emit devicesChanged(); - emit selectedDeviceChanged(index); - emit selectedDeviceChanged("abc"); - } -}; - - -class tst_QVideoDeviceControl : public QObject -{ - Q_OBJECT -public: - tst_QVideoDeviceControl(){} - ~tst_QVideoDeviceControl(){} - -private slots: - void testQVideoDeviceControl(); -}; - -//MaemoAPI-1859:QVideoDeviceControl constructor -void tst_QVideoDeviceControl::testQVideoDeviceControl() -{ - TestClass *testClass = new TestClass(this); - QVERIFY(testClass != NULL); -} - -QTEST_MAIN(tst_QVideoDeviceControl) -#include "tst_qvideodevicecontrol.moc" diff --git a/tests/auto/multimedia.pro b/tests/auto/unit/multimedia.pro index 339884be3..4dbe2b9a5 100644 --- a/tests/auto/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -6,53 +6,36 @@ SUBDIRS += \ qaudiocapturesource \ qaudiodeviceinfo \ qaudioformat \ - qaudioinput \ qaudionamespace \ - qaudiooutput \ + qcamera \ + qcameraimagecapture \ qmediabindableinterface \ qmediacontainercontrol \ qmediacontent \ - qmediaplayerbackend \ + qmediaobject \ + qmediaplayer \ qmediaplaylistnavigator \ qmediarecorder \ qmediaresource \ qmediaservice \ qmediatimerange \ - qradiotuner \ + qmetadatareadercontrol \ + qmetadatawritercontrol \ qradiodata \ + qradiotuner \ + qvideoencodercontrol \ qvideoframe \ qvideosurfaceformat \ - qmetadatareadercontrol \ - qmetadatawritercontrol \ - qmediaplayer \ - qcameraimagecapture \ - qmediaobject \ - qcamera \ - qcamerabackend \ qwavedecoder -# These is disabled until intent is clearer -# qvideodevicecontrol \ -# qvideoencodercontrol \ - -# This is a commment for the mock backend directory so that maketestselftest -# doesn't believe it's an untested directory -# qmultimedia_common - - # Tests depending on private interfaces should only be built if # these interfaces are exported. contains (QT_CONFIG, private_tests) { + # These depend on controlling the set of plugins loaded (in qmediapluginloader) SUBDIRS += \ + qdeclarativeaudio \ qmediaplaylist \ qmediapluginloader \ qmediaimageviewer \ qmediaserviceprovider - - contains (QT_CONFIG, declarative) { - # All the declarative tests depend on private interfaces - SUBDIRS += \ - qsoundeffect \ - qdeclarativeaudio - } } diff --git a/tests/auto/multimediawidgets.pro b/tests/auto/unit/multimediawidgets.pro index 5a55ecc37..0105e3ed7 100644 --- a/tests/auto/multimediawidgets.pro +++ b/tests/auto/unit/multimediawidgets.pro @@ -5,10 +5,6 @@ SUBDIRS += \ qcamerawidgets \ qmediaplayerwidgets \ -# This is a commment for the mock backend directory so that maketestselftest -# doesn't believe it's an untested directory -# qmultimedia_common - # Tests depending on private interfaces should only be built if # these interfaces are exported. contains (QT_CONFIG, private_tests) { @@ -17,9 +13,5 @@ contains (QT_CONFIG, private_tests) { qpaintervideosurface \ qmediaimageviewerwidgets \ qvideowidget \ - - contains (QT_CONFIG, declarative) { - disabled:SUBDIRS += qdeclarativevideo - } } diff --git a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro index dfb7e5d7b..dfb7e5d7b 100644 --- a/tests/auto/qabstractvideobuffer/qabstractvideobuffer.pro +++ b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro diff --git a/tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp b/tests/auto/unit/qabstractvideobuffer/tst_qabstractvideobuffer.cpp index fc33bf5a9..fc33bf5a9 100644 --- a/tests/auto/qabstractvideobuffer/tst_qabstractvideobuffer.cpp +++ b/tests/auto/unit/qabstractvideobuffer/tst_qabstractvideobuffer.cpp diff --git a/tests/auto/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro index c1718a683..c1718a683 100644 --- a/tests/auto/qabstractvideosurface/qabstractvideosurface.pro +++ b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro diff --git a/tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp b/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp index 1f3cdea06..1f3cdea06 100644 --- a/tests/auto/qabstractvideosurface/tst_qabstractvideosurface.cpp +++ b/tests/auto/unit/qabstractvideosurface/tst_qabstractvideosurface.cpp diff --git a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro index 1d0c2e294..1d0c2e294 100644 --- a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro +++ b/tests/auto/unit/qaudiocapturesource/qaudiocapturesource.pro diff --git a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp b/tests/auto/unit/qaudiocapturesource/tst_qaudiocapturesource.cpp index d2620b8eb..d2620b8eb 100644 --- a/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp +++ b/tests/auto/unit/qaudiocapturesource/tst_qaudiocapturesource.cpp diff --git a/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/unit/qaudiodeviceinfo/qaudiodeviceinfo.pro index ffe9829bd..ffe9829bd 100644 --- a/tests/auto/qaudiodeviceinfo/qaudiodeviceinfo.pro +++ b/tests/auto/unit/qaudiodeviceinfo/qaudiodeviceinfo.pro diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/unit/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp index f459a7449..f459a7449 100644 --- a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp +++ b/tests/auto/unit/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp diff --git a/tests/auto/qaudioformat/qaudioformat.pro b/tests/auto/unit/qaudioformat/qaudioformat.pro index 59ba5c38f..59ba5c38f 100644 --- a/tests/auto/qaudioformat/qaudioformat.pro +++ b/tests/auto/unit/qaudioformat/qaudioformat.pro diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/unit/qaudioformat/tst_qaudioformat.cpp index cdfa4766c..cdfa4766c 100644 --- a/tests/auto/qaudioformat/tst_qaudioformat.cpp +++ b/tests/auto/unit/qaudioformat/tst_qaudioformat.cpp diff --git a/tests/auto/qaudionamespace/qaudionamespace.pro b/tests/auto/unit/qaudionamespace/qaudionamespace.pro index 30052ce3f..30052ce3f 100644 --- a/tests/auto/qaudionamespace/qaudionamespace.pro +++ b/tests/auto/unit/qaudionamespace/qaudionamespace.pro diff --git a/tests/auto/qaudionamespace/tst_qaudionamespace.cpp b/tests/auto/unit/qaudionamespace/tst_qaudionamespace.cpp index 1140e5520..1140e5520 100644 --- a/tests/auto/qaudionamespace/tst_qaudionamespace.cpp +++ b/tests/auto/unit/qaudionamespace/tst_qaudionamespace.cpp diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/unit/qcamera/qcamera.pro index c69754567..095349d81 100644 --- a/tests/auto/qcamera/qcamera.pro +++ b/tests/auto/unit/qcamera/qcamera.pro @@ -8,5 +8,3 @@ include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mockcamera.pri) SOURCES += tst_qcamera.cpp - -maemo*:CONFIG += insignificant_test diff --git a/tests/auto/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index de44ae0d8..de44ae0d8 100644 --- a/tests/auto/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp diff --git a/tests/auto/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro index fdd2cf501..fdd2cf501 100644 --- a/tests/auto/qcameraimagecapture/qcameraimagecapture.pro +++ b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro diff --git a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp index e842cbb83..e842cbb83 100644 --- a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/unit/qcameraimagecapture/tst_qcameraimagecapture.cpp diff --git a/tests/auto/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro index a53729a4f..a53729a4f 100644 --- a/tests/auto/qcameraviewfinder/qcameraviewfinder.pro +++ b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro diff --git a/tests/auto/qcameraviewfinder/tst_qcameraviewfinder.cpp b/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp index 106a87bc7..106a87bc7 100644 --- a/tests/auto/qcameraviewfinder/tst_qcameraviewfinder.cpp +++ b/tests/auto/unit/qcameraviewfinder/tst_qcameraviewfinder.cpp diff --git a/tests/auto/qcamerawidgets/qcamerawidgets.pro b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro index f8de4af50..f8de4af50 100644 --- a/tests/auto/qcamerawidgets/qcamerawidgets.pro +++ b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro diff --git a/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp index 92cafda6e..92cafda6e 100644 --- a/tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp +++ b/tests/auto/unit/qcamerawidgets/tst_qcamerawidgets.cpp diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro index 35f11735c..35f11735c 100644 --- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index ef538b665..ef538b665 100644 --- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro index cd1c615cf..cd1c615cf 100644 --- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro +++ b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/unit/qdeclarativevideo/tst_qdeclarativevideo.cpp index 5a0dce318..5a0dce318 100644 --- a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp +++ b/tests/auto/unit/qdeclarativevideo/tst_qdeclarativevideo.cpp diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro index eac437632..eac437632 100644 --- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro +++ b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index 393ac7a49..393ac7a49 100644 --- a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp diff --git a/tests/auto/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro index 366a4e6f0..366a4e6f0 100644 --- a/tests/auto/qmediabindableinterface/qmediabindableinterface.pro +++ b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro diff --git a/tests/auto/qmediabindableinterface/tst_qmediabindableinterface.cpp b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp index d7f06db8a..d7f06db8a 100644 --- a/tests/auto/qmediabindableinterface/tst_qmediabindableinterface.cpp +++ b/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp diff --git a/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro index 90dcbf82e..90dcbf82e 100644 --- a/tests/auto/qmediacontainercontrol/qmediacontainercontrol.pro +++ b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro diff --git a/tests/auto/qmediacontainercontrol/tst_qmediacontainercontrol.cpp b/tests/auto/unit/qmediacontainercontrol/tst_qmediacontainercontrol.cpp index e5dabd12d..e5dabd12d 100644 --- a/tests/auto/qmediacontainercontrol/tst_qmediacontainercontrol.cpp +++ b/tests/auto/unit/qmediacontainercontrol/tst_qmediacontainercontrol.cpp diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/unit/qmediacontent/qmediacontent.pro index d55218dd5..d55218dd5 100644 --- a/tests/auto/qmediacontent/qmediacontent.pro +++ b/tests/auto/unit/qmediacontent/qmediacontent.pro diff --git a/tests/auto/qmediacontent/tst_qmediacontent.cpp b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp index a215b479c..a215b479c 100644 --- a/tests/auto/qmediacontent/tst_qmediacontent.cpp +++ b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp diff --git a/tests/auto/qmediaimageviewer/images.qrc b/tests/auto/unit/qmediaimageviewer/images.qrc index 508de1369..508de1369 100644 --- a/tests/auto/qmediaimageviewer/images.qrc +++ b/tests/auto/unit/qmediaimageviewer/images.qrc diff --git a/tests/auto/qmediaimageviewer/images/coverart.png b/tests/auto/unit/qmediaimageviewer/images/coverart.png Binary files differindex a24db1b13..a24db1b13 100644 --- a/tests/auto/qmediaimageviewer/images/coverart.png +++ b/tests/auto/unit/qmediaimageviewer/images/coverart.png diff --git a/tests/auto/qmediaimageviewer/images/image.jpg b/tests/auto/unit/qmediaimageviewer/images/image.jpg Binary files differindex 8771224cb..8771224cb 100644 --- a/tests/auto/qmediaimageviewer/images/image.jpg +++ b/tests/auto/unit/qmediaimageviewer/images/image.jpg diff --git a/tests/auto/qmediaimageviewer/images/image.png b/tests/auto/unit/qmediaimageviewer/images/image.png Binary files differindex a24db1b13..a24db1b13 100644 --- a/tests/auto/qmediaimageviewer/images/image.png +++ b/tests/auto/unit/qmediaimageviewer/images/image.png diff --git a/tests/auto/qmediaimageviewer/images/invalid.png b/tests/auto/unit/qmediaimageviewer/images/invalid.png index 3aba327ee..3aba327ee 100644 --- a/tests/auto/qmediaimageviewer/images/invalid.png +++ b/tests/auto/unit/qmediaimageviewer/images/invalid.png diff --git a/tests/auto/qmediaimageviewer/images/poster.png b/tests/auto/unit/qmediaimageviewer/images/poster.png Binary files differindex a24db1b13..a24db1b13 100644 --- a/tests/auto/qmediaimageviewer/images/poster.png +++ b/tests/auto/unit/qmediaimageviewer/images/poster.png diff --git a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro b/tests/auto/unit/qmediaimageviewer/qmediaimageviewer.pro index 4724f6141..4724f6141 100644 --- a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro +++ b/tests/auto/unit/qmediaimageviewer/qmediaimageviewer.pro diff --git a/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp b/tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp index 00cfe8549..00cfe8549 100644 --- a/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp +++ b/tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp diff --git a/tests/auto/qmediaimageviewerwidgets/images.qrc b/tests/auto/unit/qmediaimageviewerwidgets/images.qrc index 1d4edce17..1d4edce17 100644 --- a/tests/auto/qmediaimageviewerwidgets/images.qrc +++ b/tests/auto/unit/qmediaimageviewerwidgets/images.qrc diff --git a/tests/auto/qmediaimageviewerwidgets/images/image.png b/tests/auto/unit/qmediaimageviewerwidgets/images/image.png Binary files differindex a24db1b13..a24db1b13 100644 --- a/tests/auto/qmediaimageviewerwidgets/images/image.png +++ b/tests/auto/unit/qmediaimageviewerwidgets/images/image.png diff --git a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro b/tests/auto/unit/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro index a37ae8832..a37ae8832 100644 --- a/tests/auto/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro +++ b/tests/auto/unit/qmediaimageviewerwidgets/qmediaimageviewerwidgets.pro diff --git a/tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp b/tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp index 80c745fe0..80c745fe0 100644 --- a/tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp +++ b/tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp diff --git a/tests/auto/qmediaobject/main.cpp b/tests/auto/unit/qmediaobject/main.cpp index 5e822768d..5e822768d 100644 --- a/tests/auto/qmediaobject/main.cpp +++ b/tests/auto/unit/qmediaobject/main.cpp diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/unit/qmediaobject/qmediaobject.pro index 01ee43e04..01ee43e04 100644 --- a/tests/auto/qmediaobject/qmediaobject.pro +++ b/tests/auto/unit/qmediaobject/qmediaobject.pro diff --git a/tests/auto/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index dde293634..dde293634 100644 --- a/tests/auto/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp diff --git a/tests/auto/qmediaobject/tst_qmediaobject.h b/tests/auto/unit/qmediaobject/tst_qmediaobject.h index 5bc70c4a4..5bc70c4a4 100644 --- a/tests/auto/qmediaobject/tst_qmediaobject.h +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.h diff --git a/tests/auto/qmediaplayer/main.cpp b/tests/auto/unit/qmediaplayer/main.cpp index 417dcd3f1..417dcd3f1 100755 --- a/tests/auto/qmediaplayer/main.cpp +++ b/tests/auto/unit/qmediaplayer/main.cpp diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/qmediaplayer/qmediaplayer.pro index f770f1e07..f770f1e07 100644 --- a/tests/auto/qmediaplayer/qmediaplayer.pro +++ b/tests/auto/unit/qmediaplayer/qmediaplayer.pro diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp index 383a4c4f3..383a4c4f3 100644 --- a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.h b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.h index 76a94cccf..76a94cccf 100755 --- a/tests/auto/qmediaplayer/tst_qmediaplayer.h +++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.h diff --git a/tests/auto/qmediaplayerwidgets/main.cpp b/tests/auto/unit/qmediaplayerwidgets/main.cpp index e7614c975..e7614c975 100755 --- a/tests/auto/qmediaplayerwidgets/main.cpp +++ b/tests/auto/unit/qmediaplayerwidgets/main.cpp diff --git a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro index c5c602938..c5c602938 100644 --- a/tests/auto/qmediaplayerwidgets/qmediaplayerwidgets.pro +++ b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro diff --git a/tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp index ac9ffa0ce..ac9ffa0ce 100644 --- a/tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp +++ b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp diff --git a/tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.h b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.h index e5f9b674a..e5f9b674a 100755 --- a/tests/auto/qmediaplayerwidgets/tst_qmediaplayerwidgets.h +++ b/tests/auto/unit/qmediaplayerwidgets/tst_qmediaplayerwidgets.h diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro index d02834387..c6b28a7cf 100644 --- a/tests/auto/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro @@ -1,9 +1,6 @@ CONFIG += testcase TARGET = tst_qmediaplaylist -# temporarily blacklist test because is fails miserably -CONFIG += insignificant_test - include (../qmultimedia_common/mockplaylist.pri) QT += multimedia-private testlib diff --git a/tests/auto/qmediaplaylist/testdata/test.m3u b/tests/auto/unit/qmediaplaylist/testdata/test.m3u index e5cb7c828..e5cb7c828 100644 --- a/tests/auto/qmediaplaylist/testdata/test.m3u +++ b/tests/auto/unit/qmediaplaylist/testdata/test.m3u diff --git a/tests/auto/qmediaplaylist/testdata/testfile b/tests/auto/unit/qmediaplaylist/testdata/testfile index e69de29bb..e69de29bb 100644 --- a/tests/auto/qmediaplaylist/testdata/testfile +++ b/tests/auto/unit/qmediaplaylist/testdata/testfile diff --git a/tests/auto/qmediaplaylist/testdata/testfile2#suffix b/tests/auto/unit/qmediaplaylist/testdata/testfile2#suffix index e69de29bb..e69de29bb 100644 --- a/tests/auto/qmediaplaylist/testdata/testfile2#suffix +++ b/tests/auto/unit/qmediaplaylist/testdata/testfile2#suffix diff --git a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index e2002435f..91c4dda55 100644 --- a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -368,13 +368,13 @@ void tst_QMediaPlaylist::saveAndLoad() QVERIFY(playlist.error() != QMediaPlaylist::NoError); QVERIFY(!playlist.errorString().isEmpty()); - res = playlist.save(QUrl(QLatin1String("tmp.unsupported_format")), "unsupported_format"); + res = playlist.save(QUrl::fromLocalFile(QLatin1String("tmp.unsupported_format")), "unsupported_format"); QVERIFY(!res); QVERIFY(playlist.error() != QMediaPlaylist::NoError); QVERIFY(!playlist.errorString().isEmpty()); errorSignal.clear(); - playlist.load(QUrl(QLatin1String("tmp.unsupported_format")), "unsupported_format"); + playlist.load(QUrl::fromLocalFile(QLatin1String("tmp.unsupported_format")), "unsupported_format"); QCOMPARE(errorSignal.size(), 1); QVERIFY(playlist.error() == QMediaPlaylist::FormatNotSupportedError); QVERIFY(!playlist.errorString().isEmpty()); @@ -393,12 +393,12 @@ void tst_QMediaPlaylist::saveAndLoad() QCOMPARE(playlist.media(0), playlist2.media(0)); QCOMPARE(playlist.media(1), playlist2.media(1)); QCOMPARE(playlist.media(3), playlist2.media(3)); - res = playlist.save(QUrl(QLatin1String("tmp.m3u")), "m3u"); + res = playlist.save(QUrl::fromLocalFile(QLatin1String("tmp.m3u")), "m3u"); QVERIFY(res); playlist2.clear(); QVERIFY(playlist2.isEmpty()); - playlist2.load(QUrl(QLatin1String("tmp.m3u")), "m3u"); + playlist2.load(QUrl::fromLocalFile(QLatin1String("tmp.m3u")), "m3u"); QCOMPARE(playlist.error(), QMediaPlaylist::NoError); QCOMPARE(playlist.mediaCount(), playlist2.mediaCount()); @@ -488,7 +488,7 @@ void tst_QMediaPlaylist::shuffle() QList<QMediaContent> contentList; for (int i=0; i<100; i++) { - QMediaContent content(QUrl(QString::number(i))); + QMediaContent content(QUrl::fromLocalFile(QString::number(i))); contentList.append(content); playlist.addMedia(content); } @@ -561,7 +561,7 @@ void tst_QMediaPlaylist::readOnlyPlaylist() QCOMPARE(playlist.mediaCount(), 3); errorSignal.clear(); - playlist.load(QUrl(QLatin1String("tmp.m3u")), "m3u"); + playlist.load(QUrl::fromLocalFile(QLatin1String("tmp.m3u")), "m3u"); QCOMPARE(errorSignal.size(), 1); QCOMPARE(playlist.error(), QMediaPlaylist::AccessDeniedError); diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro index 305d63b50..305d63b50 100644 --- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro +++ b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro diff --git a/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp b/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp index a88884735..a88884735 100644 --- a/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp +++ b/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro index f5947c6a4..f5947c6a4 100644 --- a/tests/auto/qmediapluginloader/qmediapluginloader.pro +++ b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro diff --git a/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp index 198d950a2..198d950a2 100644 --- a/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp +++ b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp diff --git a/tests/auto/qmediarecorder/main.cpp b/tests/auto/unit/qmediarecorder/main.cpp index cda3faf21..cda3faf21 100755 --- a/tests/auto/qmediarecorder/main.cpp +++ b/tests/auto/unit/qmediarecorder/main.cpp diff --git a/tests/auto/qmediarecorder/qmediarecorder.pro b/tests/auto/unit/qmediarecorder/qmediarecorder.pro index 1efaba0fc..1efaba0fc 100644 --- a/tests/auto/qmediarecorder/qmediarecorder.pro +++ b/tests/auto/unit/qmediarecorder/qmediarecorder.pro diff --git a/tests/auto/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index d99d73cfb..d99d73cfb 100644 --- a/tests/auto/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp diff --git a/tests/auto/qmediarecorder/tst_qmediarecorder.h b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.h index d0202a0c0..d0202a0c0 100755 --- a/tests/auto/qmediarecorder/tst_qmediarecorder.h +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.h diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/unit/qmediaresource/qmediaresource.pro index b6c1e7183..b6c1e7183 100644 --- a/tests/auto/qmediaresource/qmediaresource.pro +++ b/tests/auto/unit/qmediaresource/qmediaresource.pro diff --git a/tests/auto/qmediaresource/tst_qmediaresource.cpp b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp index 8051deb40..8051deb40 100644 --- a/tests/auto/qmediaresource/tst_qmediaresource.cpp +++ b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/unit/qmediaservice/qmediaservice.pro index 9ae2c5475..9ae2c5475 100644 --- a/tests/auto/qmediaservice/qmediaservice.pro +++ b/tests/auto/unit/qmediaservice/qmediaservice.pro diff --git a/tests/auto/qmediaservice/tst_qmediaservice.cpp b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp index 3a46c5626..3a46c5626 100644 --- a/tests/auto/qmediaservice/tst_qmediaservice.cpp +++ b/tests/auto/unit/qmediaservice/tst_qmediaservice.cpp diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro index d74c936e3..d74c936e3 100644 --- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro +++ b/tests/auto/unit/qmediaserviceprovider/qmediaserviceprovider.pro diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index c70401f7d..c70401f7d 100644 --- a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp diff --git a/tests/auto/qmediatimerange/qmediatimerange.pro b/tests/auto/unit/qmediatimerange/qmediatimerange.pro index 0b6626015..0b6626015 100644 --- a/tests/auto/qmediatimerange/qmediatimerange.pro +++ b/tests/auto/unit/qmediatimerange/qmediatimerange.pro diff --git a/tests/auto/qmediatimerange/tst_qmediatimerange.cpp b/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp index dd8dc5ff9..dd8dc5ff9 100644 --- a/tests/auto/qmediatimerange/tst_qmediatimerange.cpp +++ b/tests/auto/unit/qmediatimerange/tst_qmediatimerange.cpp diff --git a/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro index 0793a80af..0793a80af 100644 --- a/tests/auto/qmetadatareadercontrol/qmetadatareadercontrol.pro +++ b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro diff --git a/tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp index 30df40418..30df40418 100644 --- a/tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp +++ b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp diff --git a/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro index eef5d3239..eef5d3239 100644 --- a/tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro +++ b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro diff --git a/tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp index 68d428151..68d428151 100644 --- a/tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp +++ b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp diff --git a/tests/auto/qmultimedia_common/mock.pri b/tests/auto/unit/qmultimedia_common/mock.pri index 8b8f3e7fa..8b8f3e7fa 100644 --- a/tests/auto/qmultimedia_common/mock.pri +++ b/tests/auto/unit/qmultimedia_common/mock.pri diff --git a/tests/auto/qmultimedia_common/mockaudioencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h index 85d18664a..85d18664a 100644 --- a/tests/auto/qmultimedia_common/mockaudioencodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockaudioencodercontrol.h diff --git a/tests/auto/qmultimedia_common/mockaudioendpointselector.h b/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h index 2bc118d89..2bc118d89 100644 --- a/tests/auto/qmultimedia_common/mockaudioendpointselector.h +++ b/tests/auto/unit/qmultimedia_common/mockaudioendpointselector.h diff --git a/tests/auto/qmultimedia_common/mockcamera.pri b/tests/auto/unit/qmultimedia_common/mockcamera.pri index 233d5b8a2..233d5b8a2 100644 --- a/tests/auto/qmultimedia_common/mockcamera.pri +++ b/tests/auto/unit/qmultimedia_common/mockcamera.pri diff --git a/tests/auto/qmultimedia_common/mockcameracapturebuffercontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracapturebuffercontrol.h index d71794635..d71794635 100644 --- a/tests/auto/qmultimedia_common/mockcameracapturebuffercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameracapturebuffercontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameracapturedestinationcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h index 3f7697d1c..3f7697d1c 100644 --- a/tests/auto/qmultimedia_common/mockcameracapturedestinationcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameracontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h index 893ecbfd8..893ecbfd8 100644 --- a/tests/auto/qmultimedia_common/mockcameracontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraexposurecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h index d89762d43..d89762d43 100644 --- a/tests/auto/qmultimedia_common/mockcameraexposurecontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraflashcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h index f7a795055..f7a795055 100644 --- a/tests/auto/qmultimedia_common/mockcameraflashcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraflashcontrol.h diff --git a/tests/auto/qmultimedia_common/mockcamerafocuscontrol.h b/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h index a0fb48199..a0fb48199 100644 --- a/tests/auto/qmultimedia_common/mockcamerafocuscontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h index 5fb3cb19d..5fb3cb19d 100644 --- a/tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraimageprocessingcontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimageprocessingcontrol.h index f02f2b404..f02f2b404 100644 --- a/tests/auto/qmultimedia_common/mockcameraimageprocessingcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraimageprocessingcontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameralockscontrol.h b/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h index 87c40947d..87c40947d 100644 --- a/tests/auto/qmultimedia_common/mockcameralockscontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h diff --git a/tests/auto/qmultimedia_common/mockcameraservice.h b/tests/auto/unit/qmultimedia_common/mockcameraservice.h index ea0620a13..ea0620a13 100644 --- a/tests/auto/qmultimedia_common/mockcameraservice.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraservice.h diff --git a/tests/auto/qmultimedia_common/mockcontainer.pri b/tests/auto/unit/qmultimedia_common/mockcontainer.pri index e4a345adb..e4a345adb 100644 --- a/tests/auto/qmultimedia_common/mockcontainer.pri +++ b/tests/auto/unit/qmultimedia_common/mockcontainer.pri diff --git a/tests/auto/qmultimedia_common/mockimageencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h index c63ecd617..c63ecd617 100644 --- a/tests/auto/qmultimedia_common/mockimageencodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediacontainercontrol.h b/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h index 2a8832de2..2a8832de2 100644 --- a/tests/auto/qmultimedia_common/mockmediacontainercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediacontainercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmedianetworkaccesscontrol.h b/tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h index 472a30fc7..472a30fc7 100644 --- a/tests/auto/qmultimedia_common/mockmedianetworkaccesscontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmedianetworkaccesscontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediaobject.h b/tests/auto/unit/qmultimedia_common/mockmediaobject.h index fcc5c3731..fcc5c3731 100644 --- a/tests/auto/qmultimedia_common/mockmediaobject.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaobject.h diff --git a/tests/auto/qmultimedia_common/mockmediaplayercontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplayercontrol.h index d88409ca5..d88409ca5 100644 --- a/tests/auto/qmultimedia_common/mockmediaplayercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaplayercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediaplayerservice.h b/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h index fb0f1b28d..fb0f1b28d 100644 --- a/tests/auto/qmultimedia_common/mockmediaplayerservice.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaplayerservice.h diff --git a/tests/auto/qmultimedia_common/mockmediaplaylistcontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h index 186db69f1..186db69f1 100644 --- a/tests/auto/qmultimedia_common/mockmediaplaylistcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediaplaylistsourcecontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h index c43ef9b5d..c43ef9b5d 100644 --- a/tests/auto/qmultimedia_common/mockmediaplaylistsourcecontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaplaylistsourcecontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediarecordercontrol.h b/tests/auto/unit/qmultimedia_common/mockmediarecordercontrol.h index 77c1378a8..77c1378a8 100644 --- a/tests/auto/qmultimedia_common/mockmediarecordercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediarecordercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmediarecorderservice.h b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h index fa8c29a5a..fa8c29a5a 100644 --- a/tests/auto/qmultimedia_common/mockmediarecorderservice.h +++ b/tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h diff --git a/tests/auto/qmultimedia_common/mockmediaservice.h b/tests/auto/unit/qmultimedia_common/mockmediaservice.h index 3ceb1ad74..3ceb1ad74 100644 --- a/tests/auto/qmultimedia_common/mockmediaservice.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaservice.h diff --git a/tests/auto/qmultimedia_common/mockmediaserviceprovider.h b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h index 4573d7f96..4573d7f96 100644 --- a/tests/auto/qmultimedia_common/mockmediaserviceprovider.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h diff --git a/tests/auto/qmultimedia_common/mockmediastreamscontrol.h b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h index d1d967df6..d1d967df6 100644 --- a/tests/auto/qmultimedia_common/mockmediastreamscontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h diff --git a/tests/auto/qmultimedia_common/mockmetadatareadercontrol.h b/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h index f0847622f..f0847622f 100644 --- a/tests/auto/qmultimedia_common/mockmetadatareadercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmetadatareadercontrol.h diff --git a/tests/auto/qmultimedia_common/mockmetadatawritercontrol.h b/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h index e9f7c7573..e9f7c7573 100644 --- a/tests/auto/qmultimedia_common/mockmetadatawritercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmetadatawritercontrol.h diff --git a/tests/auto/qmultimedia_common/mockplayer.pri b/tests/auto/unit/qmultimedia_common/mockplayer.pri index a5040ac80..a5040ac80 100644 --- a/tests/auto/qmultimedia_common/mockplayer.pri +++ b/tests/auto/unit/qmultimedia_common/mockplayer.pri diff --git a/tests/auto/qmultimedia_common/mockplaylist.pri b/tests/auto/unit/qmultimedia_common/mockplaylist.pri index c27c839c5..c27c839c5 100644 --- a/tests/auto/qmultimedia_common/mockplaylist.pri +++ b/tests/auto/unit/qmultimedia_common/mockplaylist.pri diff --git a/tests/auto/qmultimedia_common/mockplaylistservice.h b/tests/auto/unit/qmultimedia_common/mockplaylistservice.h index 3e1210c28..3e1210c28 100644 --- a/tests/auto/qmultimedia_common/mockplaylistservice.h +++ b/tests/auto/unit/qmultimedia_common/mockplaylistservice.h diff --git a/tests/auto/qmultimedia_common/mockradio.pri b/tests/auto/unit/qmultimedia_common/mockradio.pri index 0f7f84a2f..0f7f84a2f 100644 --- a/tests/auto/qmultimedia_common/mockradio.pri +++ b/tests/auto/unit/qmultimedia_common/mockradio.pri diff --git a/tests/auto/qmultimedia_common/mockradiodatacontrol.h b/tests/auto/unit/qmultimedia_common/mockradiodatacontrol.h index ca6eb4020..ca6eb4020 100644 --- a/tests/auto/qmultimedia_common/mockradiodatacontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockradiodatacontrol.h diff --git a/tests/auto/qmultimedia_common/mockradiotunercontrol.h b/tests/auto/unit/qmultimedia_common/mockradiotunercontrol.h index 664825356..664825356 100644 --- a/tests/auto/qmultimedia_common/mockradiotunercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockradiotunercontrol.h diff --git a/tests/auto/qmultimedia_common/mockreadonlyplaylistprovider.h b/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h index 12e48e03a..12e48e03a 100644 --- a/tests/auto/qmultimedia_common/mockreadonlyplaylistprovider.h +++ b/tests/auto/unit/qmultimedia_common/mockreadonlyplaylistprovider.h diff --git a/tests/auto/qmultimedia_common/mockrecorder.pri b/tests/auto/unit/qmultimedia_common/mockrecorder.pri index 6f8438d8f..6f8438d8f 100644 --- a/tests/auto/qmultimedia_common/mockrecorder.pri +++ b/tests/auto/unit/qmultimedia_common/mockrecorder.pri diff --git a/tests/auto/qmultimedia_common/mockvideo.pri b/tests/auto/unit/qmultimedia_common/mockvideo.pri index ea991661f..ea991661f 100644 --- a/tests/auto/qmultimedia_common/mockvideo.pri +++ b/tests/auto/unit/qmultimedia_common/mockvideo.pri diff --git a/tests/auto/qmultimedia_common/mockvideoencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h index f628c6730..f628c6730 100644 --- a/tests/auto/qmultimedia_common/mockvideoencodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockvideoencodercontrol.h diff --git a/tests/auto/qmultimedia_common/mockvideorenderercontrol.h b/tests/auto/unit/qmultimedia_common/mockvideorenderercontrol.h index c98dd761a..c98dd761a 100644 --- a/tests/auto/qmultimedia_common/mockvideorenderercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockvideorenderercontrol.h diff --git a/tests/auto/qmultimedia_common/mockvideosurface.h b/tests/auto/unit/qmultimedia_common/mockvideosurface.h index bbfe35448..bbfe35448 100644 --- a/tests/auto/qmultimedia_common/mockvideosurface.h +++ b/tests/auto/unit/qmultimedia_common/mockvideosurface.h diff --git a/tests/auto/qmultimedia_common/mockvideowindowcontrol.h b/tests/auto/unit/qmultimedia_common/mockvideowindowcontrol.h index 83255e24c..83255e24c 100644 --- a/tests/auto/qmultimedia_common/mockvideowindowcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockvideowindowcontrol.h diff --git a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro index edf9c8975..edf9c8975 100644 --- a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro +++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro diff --git a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index 53ed906e9..53ed906e9 100644 --- a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp diff --git a/tests/auto/qradiodata/main.cpp b/tests/auto/unit/qradiodata/main.cpp index 1bd2e27be..1bd2e27be 100755 --- a/tests/auto/qradiodata/main.cpp +++ b/tests/auto/unit/qradiodata/main.cpp diff --git a/tests/auto/qradiodata/qradiodata.pro b/tests/auto/unit/qradiodata/qradiodata.pro index 0e3c4edec..0e3c4edec 100644 --- a/tests/auto/qradiodata/qradiodata.pro +++ b/tests/auto/unit/qradiodata/qradiodata.pro diff --git a/tests/auto/qradiodata/tst_qradiodata.cpp b/tests/auto/unit/qradiodata/tst_qradiodata.cpp index 157f63def..157f63def 100644 --- a/tests/auto/qradiodata/tst_qradiodata.cpp +++ b/tests/auto/unit/qradiodata/tst_qradiodata.cpp diff --git a/tests/auto/qradiodata/tst_qradiodata.h b/tests/auto/unit/qradiodata/tst_qradiodata.h index 985197566..985197566 100644 --- a/tests/auto/qradiodata/tst_qradiodata.h +++ b/tests/auto/unit/qradiodata/tst_qradiodata.h diff --git a/tests/auto/qradiotuner/main.cpp b/tests/auto/unit/qradiotuner/main.cpp index b2d6fd2b1..b2d6fd2b1 100755 --- a/tests/auto/qradiotuner/main.cpp +++ b/tests/auto/unit/qradiotuner/main.cpp diff --git a/tests/auto/qradiotuner/qradiotuner.pro b/tests/auto/unit/qradiotuner/qradiotuner.pro index 3d3a21f5d..3d3a21f5d 100644 --- a/tests/auto/qradiotuner/qradiotuner.pro +++ b/tests/auto/unit/qradiotuner/qradiotuner.pro diff --git a/tests/auto/qradiotuner/tst_qradiotuner.cpp b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp index c42642283..c42642283 100644 --- a/tests/auto/qradiotuner/tst_qradiotuner.cpp +++ b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp diff --git a/tests/auto/qradiotuner/tst_qradiotuner.h b/tests/auto/unit/qradiotuner/tst_qradiotuner.h index 364f5e2d9..364f5e2d9 100644 --- a/tests/auto/qradiotuner/tst_qradiotuner.h +++ b/tests/auto/unit/qradiotuner/tst_qradiotuner.h diff --git a/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro b/tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro index ad14a25af..ad14a25af 100644 --- a/tests/auto/qvideoencodercontrol/qvideoencodercontrol.pro +++ b/tests/auto/unit/qvideoencodercontrol/qvideoencodercontrol.pro diff --git a/tests/auto/qvideoencodercontrol/tst_qvideoencodercontrol.cpp b/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp index 4f1b99d8e..4f1b99d8e 100644 --- a/tests/auto/qvideoencodercontrol/tst_qvideoencodercontrol.cpp +++ b/tests/auto/unit/qvideoencodercontrol/tst_qvideoencodercontrol.cpp diff --git a/tests/auto/qvideoframe/qvideoframe.pro b/tests/auto/unit/qvideoframe/qvideoframe.pro index cfd84a2db..cfd84a2db 100644 --- a/tests/auto/qvideoframe/qvideoframe.pro +++ b/tests/auto/unit/qvideoframe/qvideoframe.pro diff --git a/tests/auto/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp index 595fbcf71..595fbcf71 100644 --- a/tests/auto/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp diff --git a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro index a0e6266b4..a0e6266b4 100644 --- a/tests/auto/qvideosurfaceformat/qvideosurfaceformat.pro +++ b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro diff --git a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp index 85cc81dcd..85cc81dcd 100644 --- a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp +++ b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/unit/qvideowidget/qvideowidget.pro index d0ea9fa7c..d0ea9fa7c 100644 --- a/tests/auto/qvideowidget/qvideowidget.pro +++ b/tests/auto/unit/qvideowidget/qvideowidget.pro diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp index 9f9bafc50..9f9bafc50 100644 --- a/tests/auto/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp diff --git a/tests/auto/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav b/tests/auto/unit/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav Binary files differindex b6eac4d70..b6eac4d70 100644 --- a/tests/auto/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav +++ b/tests/auto/unit/qwavedecoder/data/corrupt_datadesc_1_16_8000.le.wav diff --git a/tests/auto/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav b/tests/auto/unit/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav Binary files differindex 2f0da1370..2f0da1370 100644 --- a/tests/auto/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav +++ b/tests/auto/unit/qwavedecoder/data/corrupt_fmtdesc_1_16_8000.le.wav diff --git a/tests/auto/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav b/tests/auto/unit/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav Binary files differindex b14a53c9e..b14a53c9e 100644 --- a/tests/auto/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav +++ b/tests/auto/unit/qwavedecoder/data/corrupt_fmtstring_1_16_8000.le.wav diff --git a/tests/auto/qwavedecoder/data/empty.wav b/tests/auto/unit/qwavedecoder/data/empty.wav index e69de29bb..e69de29bb 100644 --- a/tests/auto/qwavedecoder/data/empty.wav +++ b/tests/auto/unit/qwavedecoder/data/empty.wav diff --git a/tests/auto/qwavedecoder/data/gendata.sh b/tests/auto/unit/qwavedecoder/data/gendata.sh index 0dd82cef7..0dd82cef7 100755 --- a/tests/auto/qwavedecoder/data/gendata.sh +++ b/tests/auto/unit/qwavedecoder/data/gendata.sh diff --git a/tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le.wav Binary files differindex 88b1a8379..88b1a8379 100644 --- a/tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_1_16_44100_le.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_16_8000_le.wav Binary files differindex 83a405907..83a405907 100644 --- a/tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_1_16_8000_le.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_32_44100_le.wav Binary files differindex 9c437b155..9c437b155 100644 --- a/tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_1_32_44100_le.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_32_8000_le.wav Binary files differindex f90a8bc35..f90a8bc35 100644 --- a/tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_1_32_8000_le.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_8_44100.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_8_44100.wav Binary files differindex 7d10829ea..7d10829ea 100644 --- a/tests/auto/qwavedecoder/data/isawav_1_8_44100.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_1_8_44100.wav diff --git a/tests/auto/qwavedecoder/data/isawav_1_8_8000.wav b/tests/auto/unit/qwavedecoder/data/isawav_1_8_8000.wav Binary files differindex 76c08e89e..76c08e89e 100644 --- a/tests/auto/qwavedecoder/data/isawav_1_8_8000.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_1_8_8000.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_16_44100_be.wav Binary files differindex ca0cd425a..ca0cd425a 100644 --- a/tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_2_16_44100_be.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_16_8000_be.wav Binary files differindex 3a684590b..3a684590b 100644 --- a/tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_2_16_8000_be.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_32_44100_be.wav Binary files differindex f1aaf2906..f1aaf2906 100644 --- a/tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_2_32_44100_be.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_32_8000_be.wav Binary files differindex c10c20872..c10c20872 100644 --- a/tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_2_32_8000_be.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_8_44100.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_8_44100.wav Binary files differindex befd02baf..befd02baf 100644 --- a/tests/auto/qwavedecoder/data/isawav_2_8_44100.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_2_8_44100.wav diff --git a/tests/auto/qwavedecoder/data/isawav_2_8_8000.wav b/tests/auto/unit/qwavedecoder/data/isawav_2_8_8000.wav Binary files differindex ce8b0d06a..ce8b0d06a 100644 --- a/tests/auto/qwavedecoder/data/isawav_2_8_8000.wav +++ b/tests/auto/unit/qwavedecoder/data/isawav_2_8_8000.wav diff --git a/tests/auto/qwavedecoder/data/nosampledata.wav b/tests/auto/unit/qwavedecoder/data/nosampledata.wav Binary files differindex 8dbde9545..8dbde9545 100644 --- a/tests/auto/qwavedecoder/data/nosampledata.wav +++ b/tests/auto/unit/qwavedecoder/data/nosampledata.wav diff --git a/tests/auto/qwavedecoder/data/notawav.wav b/tests/auto/unit/qwavedecoder/data/notawav.wav index 36a20ea05..36a20ea05 100644 --- a/tests/auto/qwavedecoder/data/notawav.wav +++ b/tests/auto/unit/qwavedecoder/data/notawav.wav diff --git a/tests/auto/qwavedecoder/data/onebyte.wav b/tests/auto/unit/qwavedecoder/data/onebyte.wav index d00491fd7..d00491fd7 100644 --- a/tests/auto/qwavedecoder/data/onebyte.wav +++ b/tests/auto/unit/qwavedecoder/data/onebyte.wav diff --git a/tests/auto/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro index db3f264e4..7428c5c3e 100644 --- a/tests/auto/qwavedecoder/qwavedecoder.pro +++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro @@ -1,7 +1,7 @@ TARGET = tst_qwavedecoder -HEADERS += ../../../src/multimedia/effects/qwavedecoder_p.h +HEADERS += $$QT.multimedia.sources/effects/qwavedecoder_p.h SOURCES += tst_qwavedecoder.cpp \ - ../../../src/multimedia/effects/qwavedecoder_p.cpp + $$QT.multimedia.sources/effects/qwavedecoder_p.cpp QT += multimedia-private testlib network CONFIG += no_private_qt_headers_warning testcase diff --git a/tests/auto/qwavedecoder/tst_qwavedecoder.cpp b/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp index a84879b0c..a84879b0c 100644 --- a/tests/auto/qwavedecoder/tst_qwavedecoder.cpp +++ b/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro new file mode 100644 index 000000000..1043abf08 --- /dev/null +++ b/tests/auto/unit/unit.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS += multimedia.pro +contains(QT_CONFIG,multimediawidgets): SUBDIRS += multimediawidgets.pro |