diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-01-16 15:20:59 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 15:56:19 +0100 |
| commit | c54018f8e2955f22f6e58c34fafeec0277e63958 (patch) | |
| tree | 604c9ede8b9bf3e10db64f4c2d51dcbab4aeeaf2 | |
| parent | 4b2c80c53b27b3c3cc9b0f6fc36a77a955b26dc8 (diff) | |
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>
| -rw-r--r-- | tests/auto/integration/multimedia.pro | 8 | ||||
| -rw-r--r-- | tests/auto/unit/multimedia.pro | 6 | ||||
| -rw-r--r-- | tests/auto/unit/multimediaqml.pro | 10 | ||||
| -rw-r--r-- | tests/auto/unit/unit.pro | 1 |
4 files changed, 17 insertions, 8 deletions
diff --git a/tests/auto/integration/multimedia.pro b/tests/auto/integration/multimedia.pro index 1daa1ee50..88960ec03 100644 --- a/tests/auto/integration/multimedia.pro +++ b/tests/auto/integration/multimedia.pro @@ -5,11 +5,15 @@ SUBDIRS += \ qaudiodeviceinfo \ qaudioinput \ qaudiooutput \ - qdeclarativevideooutput \ - qdeclarativevideooutput_window \ qmediaplayerbackend \ qcamerabackend \ qsoundeffect \ qsound +qtHaveModule(quick) { + SUBDIRS += \ + qdeclarativevideooutput \ + qdeclarativevideooutput_window +} + !qtHaveModule(widgets): SUBDIRS -= qcamerabackend diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro index 309d41255..f9bf0f35f 100644 --- a/tests/auto/unit/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -30,13 +30,7 @@ SUBDIRS += \ qvideosurfaceformat \ qwavedecoder \ qaudiobuffer \ - qdeclarativeaudio \ qaudiodecoder \ qaudioprobe \ qvideoprobe \ qsamplecache - -disabled { - SUBDIRS += \ - qdeclarativevideo -} diff --git a/tests/auto/unit/multimediaqml.pro b/tests/auto/unit/multimediaqml.pro new file mode 100644 index 000000000..cadd956ec --- /dev/null +++ b/tests/auto/unit/multimediaqml.pro @@ -0,0 +1,10 @@ + +TEMPLATE = subdirs +SUBDIRS += \ + qdeclarativeaudio \ + +disabled { + SUBDIRS += \ + qdeclarativevideo +} + diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro index 96dbf0137..37f85209e 100644 --- a/tests/auto/unit/unit.pro +++ b/tests/auto/unit/unit.pro @@ -2,3 +2,4 @@ TEMPLATE = subdirs SUBDIRS += multimedia.pro qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro +qtHaveModule(qml): SUBDIRS += multimediaqml.pro |