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 /tests/auto/integration | |
| 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>
Diffstat (limited to 'tests/auto/integration')
| -rw-r--r-- | tests/auto/integration/multimedia.pro | 8 |
1 files changed, 6 insertions, 2 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 |