slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split the unit tests for widgets up as well.

Browse Source 
Currently there seem to be some unit tests that should not depend
on widgets, so they'll have to be cleaned up later.

Change-Id: I30adc4accb3ecce86a6fe7a2fd69d3862f325a41
Reviewed-on: http://codereview.qt.nokia.com/3569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
This commit is contained in:
Michael Goddard
2011-08-25 17:12:05 +10:00
committed by Qt by Nokia
parent 0344fd84c2
commit 4ddffcdae3
3 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/auto.pro
View File

@@ -1,6 +1,7 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS += multimedia.pro SUBDIRS += multimedia.pro
contains(QT_CONFIG,multimediakitwidgets): SUBDIRS += multimediawidgets.pro
# These autotests consist of things such as static code checks # These autotests consist of things such as static code checks
# which require that the autotest is run on the same machine # which require that the autotest is run on the same machine

22
tests/auto/multimedia.pro
View File

@@ -8,15 +8,9 @@ SUBDIRS += \
qaudioformat \ qaudioformat \
qaudioinput \ qaudioinput \
qaudiooutput \ qaudiooutput \
qcamera \
qcamerabackend \
qcameraimagecapture \
qcameraviewfinder \
qmediabindableinterface \ qmediabindableinterface \
qmediacontainercontrol \ qmediacontainercontrol \
qmediacontent \ qmediacontent \
qmediaobject \
qmediaplayer \
qmediaplayerbackend \ qmediaplayerbackend \
qmediaplaylistnavigator \ qmediaplaylistnavigator \
qmediarecorder \ qmediarecorder \
@@ -29,9 +23,6 @@ SUBDIRS += \
qmetadatareadercontrol \ qmetadatareadercontrol \
qmetadatawritercontrol \ qmetadatawritercontrol \
# This is disabled because it is unfinished
# qmediastreamscontrol \
# These is disabled until intent is clearer # These is disabled until intent is clearer
# qvideodevicecontrol \ # qvideodevicecontrol \
# qvideoencodercontrol \ # qvideoencodercontrol \
@@ -45,23 +36,14 @@ SUBDIRS += \
# these interfaces are exported. # these interfaces are exported.
contains (QT_CONFIG, private_tests) { contains (QT_CONFIG, private_tests) {
SUBDIRS += \ SUBDIRS += \
qgraphicsvideoitem \
qmediaimageviewer \
qmediaplaylist \ qmediaplaylist \
qmediapluginloader \ qmediapluginloader \
qmediaserviceprovider \ qmediaserviceprovider
qpaintervideosurface \
qvideowidget \
}
contains (QT_CONFIG, declarative) { contains (QT_CONFIG, declarative) {
# All the declarative tests depend on private interfaces # All the declarative tests depend on private interfaces
contains (QT_CONFIG, private_tests) {
SUBDIRS += \ SUBDIRS += \
qsoundeffect \ qsoundeffect \
qdeclarativeaudio \ qdeclarativeaudio
disabled:SUBDIRS += qdeclarativevideo
} }
} }

28
tests/auto/multimediawidgets.pro Normal file
View File

@@ -0,0 +1,28 @@
TEMPLATE = subdirs
SUBDIRS += \
qcamera \
qcamerabackend \
qcameraimagecapture \
qcameraviewfinder \
qmediaobject \
qmediaplayer
# 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) {
SUBDIRS += \
qgraphicsvideoitem \
qmediaimageviewer \
qpaintervideosurface \
qvideowidget \
contains (QT_CONFIG, declarative) {
disabled:SUBDIRS += qdeclarativevideo
}
}