Temporarily disabled demos, examples, and some tests

Want to make QtMultimediaKit finally integrate. Disabled some
tests and ensured that tests depending on private interfaces
are only built if these interfaces are enabled.

Change-Id: I65f0ff5ea23d704cf3c2626fe4191d7d6460e46f
Reviewed-on: http://codereview.qt.nokia.com/992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Jonas Rabbe
2011-07-01 17:06:20 +10:00
committed by Qt by Nokia
parent 242d0e49b8
commit 5820946df2
6 changed files with 37 additions and 17 deletions

View File

@@ -1,28 +1,19 @@
# How do we require a module?
# requires(contains(mobility_modules,multimedia))
TEMPLATE = subdirs
SUBDIRS += \
qabstractvideobuffer \
qabstractvideosurface \
qaudiocapturesource \
qgraphicsvideoitem \
qmediaimageviewer \
qmediaobject \
qmediaplayer \
qmediaplayerbackend \
qmediaplaylist \
qmediaplaylistnavigator \
qmediapluginloader \
qmediarecorder \
qmediaresource \
qmediaservice \
qmediaserviceprovider \
qmediacontent \
qradiotuner \
qcamera \
qpaintervideosurface \
qvideowidget \
qmediatimerange \
qaudiodeviceinfo \
qaudiooutput \
@@ -32,10 +23,26 @@ SUBDIRS += \
qvideosurfaceformat \
qcamerabackend
contains (QT_CONFIG, declarative) {
SUBDIRS += \
# qsoundeffect \
qdeclarativeaudio \
qdeclarativevideo
# Tests depending on private interfaces should only be built if
# these interfaces are exported.
contains (QT_CONFIG, private-tests) {
SUBDIRS += \
qgraphicsvideoitem \
qmediaimageviewer \
qmediaplaylist \
qmediapluginloader \
qmediaserviceprovider \
qpaintervideosurface \
qvideowidget \
}
contains (QT_CONFIG, declarative) {
# All the declarative tests depend on private interfaces
contains (QT_CONFIG, private-tests) {
SUBDIRS += \
# qsoundeffect \
qdeclarativeaudio \
qdeclarativevideo
}
}