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.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/plugins/directshow/directshow.pro')

diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 95f78ed81..97e72a107 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -24,4 +24,5 @@ win32-g++ {
 include(camera/camera.pri)
 
 OTHER_FILES += \
-    directshow.json
+    directshow.json \
+    directshow_camera.json
-- 
cgit v1.2.3