diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:36:33 +0100 |
| commit | 310271a4aa43aad9d8ca09154e5af5b1d6338fc4 (patch) | |
| tree | b47ce82b4ec8a0f22b777b525d12212e4b2b9414 /src/plugins | |
| parent | a97868ac6da467a07fe0b18b23dd1fb3f2bdaf7e (diff) | |
| parent | 4df65d379733b35d9d3d5d16ed43bfefeea75763 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: Ic43abb034fa0a65b86a6e3511d29b8231ced5ec2
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/directshow/camera/dscameraservice.h | 2 | ||||
| -rw-r--r-- | src/plugins/qnx/qnx.pro | 3 | ||||
| -rw-r--r-- | src/plugins/wmf/wmfserviceplugin.h | 2 |
3 files changed, 3 insertions, 4 deletions
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; diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index 4d76fa5f7..2ad5110d6 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -11,12 +11,13 @@ blackberry { HEADERS += bbserviceplugin.h SOURCES += bbserviceplugin.cpp OTHER_FILES += blackberry_mediaservice.json + PLUGIN_CLASS_NAME = BbServicePlugin } else { HEADERS += neutrinoserviceplugin.h SOURCES += neutrinoserviceplugin.cpp OTHER_FILES += neutrino_mediaservice.json + PLUGIN_CLASS_NAME = NeutrinoServicePlugin } PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = BbServicePlugin load(qt_plugin) diff --git a/src/plugins/wmf/wmfserviceplugin.h b/src/plugins/wmf/wmfserviceplugin.h index 082358837..39b7b86d9 100644 --- a/src/plugins/wmf/wmfserviceplugin.h +++ b/src/plugins/wmf/wmfserviceplugin.h @@ -70,4 +70,4 @@ public: QString deviceDescription(const QByteArray &service, const QByteArray &device); }; -#endif // DSSERVICEPLUGIN_H +#endif // WMFSERVICEPLUGIN_H |