Make directshow-plugin available.
authorFriedemann Kleint <Friedemann.Kleint@digia.com>
Wed, 8 May 2013 09:34:31 +0000 (11:34 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 15 May 2013 10:43:08 +0000 (12:43 +0200)
commitb604d96ba8cb4b20f3a27537c591a7777e485d0e
tree8e636cca1eb1b8436dd03d96b1e4634d324a24b1
parentf4348fe3ae91ac47f45495681738505ff6005453
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>
config.tests/directshow/main.cpp
src/plugins/directshow/camera/dscamerasession.cpp
src/plugins/directshow/camera/dscamerasession.h
src/plugins/directshow/directshow.pro
src/plugins/directshow/directshow_camera.json [new file with mode: 0644]
src/plugins/directshow/dsserviceplugin.h
tests/auto/integration/multimedia.pro
tests/auto/integration/qcamerabackend/qcamerabackend.pro