summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/camera
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-12-12 09:48:13 +0100
committerLiang Qi <liang.qi@qt.io>2016-12-12 10:27:59 +0100
commit533759ef333e4db8625cd02f763994788da01199 (patch)
treedcb4b4ec8882b42ce8213f4e309534dd8d234843 /src/plugins/directshow/camera
parent31ed506ea2c7a8be439d77e02ca0d67b6f9ce675 (diff)
parent7bc230386e0d8d6f3c4ad5a0a6a22a625c9a8327 (diff)
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts: src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
Diffstat (limited to 'src/plugins/directshow/camera')
-rw-r--r--src/plugins/directshow/camera/camera.pri2
-rw-r--r--src/plugins/directshow/camera/dscameraservice.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri
index 6c67a8fe2..fb7fbd3f5 100644
--- a/src/plugins/directshow/camera/camera.pri
+++ b/src/plugins/directshow/camera/camera.pri
@@ -28,4 +28,4 @@ SOURCES += \
$$PWD/dscameraimageprocessingcontrol.cpp
*-msvc*:INCLUDEPATH += $$(DXSDK_DIR)/include
-LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
+QMAKE_USE += directshow
diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h
index dd5a7b9e3..8976e41cf 100644
--- a/src/plugins/directshow/camera/dscameraservice.h
+++ b/src/plugins/directshow/camera/dscameraservice.h
@@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE
class DSCameraControl;
class DSCameraSession;
-class DSVideoOutputControl;
class DSVideoDeviceControl;
class DSImageCaptureControl;
class DSCameraViewfinderSettingsControl;
@@ -68,7 +67,6 @@ public:
private:
DSCameraControl *m_control;
DSCameraSession *m_session;
- DSVideoOutputControl *m_videoOutput;
DSVideoDeviceControl *m_videoDevice;
QMediaControl *m_videoRenderer;
DSImageCaptureControl *m_imageCapture;