diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-05-08 11:34:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-15 12:43:08 +0200 |
| commit | b604d96ba8cb4b20f3a27537c591a7777e485d0e (patch) | |
| tree | 8e636cca1eb1b8436dd03d96b1e4634d324a24b1 /tests/auto/integration/qcamerabackend | |
| parent | f4348fe3ae91ac47f45495681738505ff6005453 (diff) | |
Make directshow-plugin available.
No longer include <qedit.h> in directshow-plugin,
which no longer ships in newer SDKs.
Ensure it only provides the camera service if the
WMF-plugin is built by using a different .json-file.
Adapt qcamerabackend-test to use widgets.
Task-number: QTBUG-28047
Change-Id: I22ea441b9edb56ff55bc275dba37c01c77d8dd90
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'tests/auto/integration/qcamerabackend')
| -rw-r--r-- | tests/auto/integration/qcamerabackend/qcamerabackend.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/integration/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro index 50da92fbd..1a0c44ea8 100644 --- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro +++ b/tests/auto/integration/qcamerabackend/qcamerabackend.pro @@ -1,6 +1,7 @@ TARGET = tst_qcamerabackend -QT += multimedia-private testlib +# DirectShow plugin requires widgets. +QT += multimedia-private widgets testlib # This is more of a system test CONFIG += testcase |