Fix build without Qml and Quick modules.

Conditionally enable auto-tests that depend on the Quick and Qml
modules.

Task-number: QTBUG-35911
Change-Id: I8b9d304ea630093d423b48a4ebc53ef6f4280244
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
This commit is contained in:
Yoann Lopes
2014-01-16 15:20:59 +01:00
committed by The Qt Project
parent 4b2c80c53b
commit c54018f8e2
4 changed files with 17 additions and 8 deletions

View File

@@ -5,11 +5,15 @@ SUBDIRS += \
qaudiodeviceinfo \ qaudiodeviceinfo \
qaudioinput \ qaudioinput \
qaudiooutput \ qaudiooutput \
qdeclarativevideooutput \
qdeclarativevideooutput_window \
qmediaplayerbackend \ qmediaplayerbackend \
qcamerabackend \ qcamerabackend \
qsoundeffect \ qsoundeffect \
qsound qsound
qtHaveModule(quick) {
SUBDIRS += \
qdeclarativevideooutput \
qdeclarativevideooutput_window
}
!qtHaveModule(widgets): SUBDIRS -= qcamerabackend !qtHaveModule(widgets): SUBDIRS -= qcamerabackend

View File

@@ -30,13 +30,7 @@ SUBDIRS += \
qvideosurfaceformat \ qvideosurfaceformat \
qwavedecoder \ qwavedecoder \
qaudiobuffer \ qaudiobuffer \
qdeclarativeaudio \
qaudiodecoder \ qaudiodecoder \
qaudioprobe \ qaudioprobe \
qvideoprobe \ qvideoprobe \
qsamplecache qsamplecache
disabled {
SUBDIRS += \
qdeclarativevideo
}

View File

@@ -0,0 +1,10 @@
TEMPLATE = subdirs
SUBDIRS += \
qdeclarativeaudio \
disabled {
SUBDIRS += \
qdeclarativevideo
}

View File

@@ -2,3 +2,4 @@ TEMPLATE = subdirs
SUBDIRS += multimedia.pro SUBDIRS += multimedia.pro
qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro
qtHaveModule(qml): SUBDIRS += multimediaqml.pro