Fix issues with namespaced build

Change-Id: I34c0492765dcc348c8766b53b389884535d00c54
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

6 files changed, 31 insertions, 15 deletions

diff --git a/tests/auto/unit/mockbackend/qmockcamera.h b/tests/auto/unit/mockbackend/qmockcamera.h
index df249271b..07cb916c9 100644
--- a/tests/auto/unit/mockbackend/qmockcamera.h
+++ b/tests/auto/unit/mockbackend/qmockcamera.h
@@ -26,13 +26,15 @@
 **
 ****************************************************************************/
 
-#ifndef MOCKCAMERACONTROL_H
-#define MOCKCAMERACONTROL_H
+#ifndef QMOCKCAMERA_H
+#define QMOCKCAMERA_H
 
 #include "private/qplatformcamera_p.h"
 #include "qcamerainfo.h"
 #include <qtimer.h>
 
+QT_BEGIN_NAMESPACE
+
 class QMockCamera : public QPlatformCamera
 {
     friend class MockCaptureControl;
@@ -186,6 +188,6 @@ public:
     bool m_propertyChangesSupported;
 };
 
+QT_END_NAMESPACE
 
-
-#endif // MOCKCAMERACONTROL_H
+#endif // QMOCKCAMERA_H
diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.h b/tests/auto/unit/mockbackend/qmockimagecapture.h
index 7b7a2a5e1..139c12474 100644
--- a/tests/auto/unit/mockbackend/qmockimagecapture.h
+++ b/tests/auto/unit/mockbackend/qmockimagecapture.h
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-#ifndef MOCKCAMERACAPTURECONTROL_H
-#define MOCKCAMERACAPTURECONTROL_H
+#ifndef QMOCKCAMERAIMAGECAPTURE_H
+#define QMOCKCAMERAIMAGECAPTURE_H
 
 #include <QDateTime>
 #include <QTimer>
@@ -36,6 +36,8 @@
 #include "private/qplatformcameraimagecapture_p.h"
 #include "private/qplatformcamera_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class QMockMediaCaptureSession;
 
 class QMockImageCapture : public QPlatformCameraImageCapture
@@ -66,4 +68,6 @@ private:
     QImageEncoderSettings m_settings;
 };
 
-#endif // MOCKCAMERACAPTURECONTROL_H
+QT_END_NAMESPACE
+
+#endif // QMOCKCAMERAIMAGECAPTURE_H
diff --git a/tests/auto/unit/mockbackend/qmockmediacapturesession.h b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
index 7060e349e..c136892c0 100644
--- a/tests/auto/unit/mockbackend/qmockmediacapturesession.h
+++ b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
@@ -26,8 +26,8 @@
 **
 ****************************************************************************/
 
-#ifndef MOCKSERVICE_H
-#define MOCKSERVICE_H
+#ifndef QMOCKMEDIACAPTURESESSION_H
+#define QMOCKMEDIACAPTURESESSION_H
 
 #include "qmockmediaencoder.h"
 #include "qmockimagecapture.h"
@@ -35,6 +35,8 @@
 #include "qmockimagecapture.h"
 #include <private/qplatformmediacapture_p.h>
 
+QT_BEGIN_NAMESPACE
+
 class QMockMediaCaptureSession : public QPlatformMediaCaptureSession
 {
     Q_OBJECT
@@ -122,4 +124,6 @@ public:
     bool hasControls;
 };
 
-#endif // MOCKSERVICE_H
+QT_END_NAMESPACE
+
+#endif // QMOCKMEDIACAPTURESESSION_H
diff --git a/tests/auto/unit/mockbackend/qmockmediadevices_p.h b/tests/auto/unit/mockbackend/qmockmediadevices_p.h
index 30afa2276..004ab158d 100644
--- a/tests/auto/unit/mockbackend/qmockmediadevices_p.h
+++ b/tests/auto/unit/mockbackend/qmockmediadevices_p.h
@@ -58,8 +58,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession);
-
 class QCameraInfo;
 
 class QMockMediaDevices : public QPlatformMediaDevices
diff --git a/tests/auto/unit/mockbackend/qmockmediaplayer.h b/tests/auto/unit/mockbackend/qmockmediaplayer.h
index b07210846..793330f23 100644
--- a/tests/auto/unit/mockbackend/qmockmediaplayer.h
+++ b/tests/auto/unit/mockbackend/qmockmediaplayer.h
@@ -26,12 +26,14 @@
 **
 ****************************************************************************/
 
-#ifndef MOCKMEDIAPLAYER_H
-#define MOCKMEDIAPLAYER_H
+#ifndef QMOCKMEDIAPLAYER_H
+#define QMOCKMEDIAPLAYER_H
 
 #include "private/qplatformmediaplayer_p.h"
 #include <qurl.h>
 
+QT_BEGIN_NAMESPACE
+
 class QMockMediaPlayer : public QPlatformMediaPlayer
 {
     friend class QMockMediaPlayerService;
@@ -208,4 +210,6 @@ public:
     bool m_supportsStreamPlayback = false;
 };
 
-#endif // MOCKMEDIAPLAYERCONTROL_H
+QT_END_NAMESPACE
+
+#endif // QMOCKMEDIAPLAYER_H
diff --git a/tests/auto/unit/mockbackend/qmockvideosink.h b/tests/auto/unit/mockbackend/qmockvideosink.h
index 1e86074d1..9f6b5ff16 100644
--- a/tests/auto/unit/mockbackend/qmockvideosink.h
+++ b/tests/auto/unit/mockbackend/qmockvideosink.h
@@ -53,6 +53,8 @@
 
 #include <private/qplatformvideosink_p.h>
 
+QT_BEGIN_NAMESPACE
+
 class QMockVideoSink : public QPlatformVideoSink
 {
     Q_OBJECT
@@ -83,4 +85,6 @@ protected:
     QSize videoSize = QSize(640, 480);
 };
 
+QT_END_NAMESPACE
+
 #endif