From 3d9ef4d41718adc9a9099964eb4f964d1d3b63df Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Mon, 7 Nov 2016 15:44:49 +0200 Subject: Fix plugin class name when using neutrino service Fixes static linking issue with the plugin. Task-number: QTBUG-56966 Change-Id: Ie5803b048970a436f017251c0afd375fce11b2fb Reviewed-by: Yoann Lopes --- src/plugins/qnx/qnx.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins') 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) -- cgit v1.2.3 From 4430f5ebd6f593e080a6ac859e76eed5354b704f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Thu, 17 Nov 2016 17:30:12 +0100 Subject: WMF: Fix copy-and-paste error Change-Id: I6e207b49917f0d3ab1ec39b067138eefd6581a49 Reviewed-by: Yoann Lopes --- src/plugins/wmf/wmfserviceplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/wmf/wmfserviceplugin.h b/src/plugins/wmf/wmfserviceplugin.h index c65953c6a..75e5c87bd 100644 --- a/src/plugins/wmf/wmfserviceplugin.h +++ b/src/plugins/wmf/wmfserviceplugin.h @@ -64,4 +64,4 @@ public: QString deviceDescription(const QByteArray &service, const QByteArray &device); }; -#endif // DSSERVICEPLUGIN_H +#endif // WMFSERVICEPLUGIN_H -- cgit v1.2.3 From 4df65d379733b35d9d3d5d16ed43bfefeea75763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Tue, 22 Nov 2016 18:59:33 +0100 Subject: DirectShow: Remove unused class and member in DSCameraService The class DSVideoOutputControl doesn't exist anymore, and the member is not used anywhere. Change-Id: I9458822501b4669e5796b4dff0b187242134795c Reviewed-by: Yoann Lopes --- src/plugins/directshow/camera/dscameraservice.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/directshow/camera/dscameraservice.h b/src/plugins/directshow/camera/dscameraservice.h index 05222ebc4..a51d0f51c 100644 --- a/src/plugins/directshow/camera/dscameraservice.h +++ b/src/plugins/directshow/camera/dscameraservice.h @@ -42,7 +42,6 @@ QT_BEGIN_NAMESPACE class DSCameraControl; class DSCameraSession; -class DSVideoOutputControl; class DSVideoDeviceControl; class DSImageCaptureControl; class DSCameraViewfinderSettingsControl; @@ -62,7 +61,6 @@ public: private: DSCameraControl *m_control; DSCameraSession *m_session; - DSVideoOutputControl *m_videoOutput; DSVideoDeviceControl *m_videoDevice; QMediaControl *m_videoRenderer; DSImageCaptureControl *m_imageCapture; -- cgit v1.2.3