Merge remote-tracking branch 'origin/5.6' into 5.75.7

Change-Id: Ic43abb034fa0a65b86a6e3511d29b8231ced5ec2

4 files changed, 3 insertions, 17 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
diff --git a/sync.profile b/sync.profile
index 0d0eb51b7..b3a788aa3 100644
--- a/sync.profile
+++ b/sync.profile
@@ -12,16 +12,3 @@
     "qmediametadata.h" => "QMediaMetaData",
     "qmultimedia.h" => "QMultimedia"
 );
-
-# Module dependencies.
-# Every module that is required to build this module should have one entry.
-# Each of the module version specifiers can take one of the following values:
-#   - A specific Git revision.
-#   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
-#   - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
-#
-%dependencies = (
-    "qtbase" => "",
-    "qtxmlpatterns" => "",
-    "qtdeclarative" => "",
-);