From b604d96ba8cb4b20f3a27537c591a7777e485d0e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 8 May 2013 11:34:31 +0200
Subject: 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>
---
 src/plugins/directshow/directshow_camera.json | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/plugins/directshow/directshow_camera.json

(limited to 'src/plugins/directshow/directshow_camera.json')

diff --git a/src/plugins/directshow/directshow_camera.json b/src/plugins/directshow/directshow_camera.json
new file mode 100644
index 000000000..d3a58c758
--- /dev/null
+++ b/src/plugins/directshow/directshow_camera.json
@@ -0,0 +1,3 @@
+{
+    "Keys": ["org.qt-project.qt.camera"]
+}
-- 
cgit v1.2.3