Fixed AVF camera backend build with namespaced Qt

Objective-C declarations may only appear in global
scope, moved them out of Qt namespace

Change-Id: Icb136be75f544e5929ac28f0ba0681211b81a983
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/plugins/avfoundation/camera/avfcamerasession.h b/src/plugins/avfoundation/camera/avfcamerasession.h
index b2026af..86b8a23 100644 (file)
--- a/src/plugins/avfoundation/camera/avfcamerasession.h
+++ b/src/plugins/avfoundation/camera/avfcamerasession.h
@@ -47,12 +47,13 @@
 
 #import <AVFoundation/AVFoundation.h>
 
+@class AVFCameraSessionObserver;
+
 QT_BEGIN_NAMESPACE
 
 class AVFCameraControl;
 class AVFCameraService;
 class AVFVideoRendererControl;
-@class AVFCameraSessionObserver;
 
 class AVFCameraSession : public QObject
 {

diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol.h b/src/plugins/avfoundation/camera/avfmediarecordercontrol.h
index 651d461..cecc00c 100644 (file)
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol.h
+++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol.h
@@ -48,12 +48,13 @@
 #import <AVFoundation/AVFoundation.h>
 #include "avfstoragelocation.h"
 
+@class AVFMediaRecorderDelegate;
+
 QT_BEGIN_NAMESPACE
 
 class AVFCameraSession;
 class AVFCameraControl;
 class AVFCameraService;
-@class AVFMediaRecorderDelegate;
 
 class AVFMediaRecorderControl : public QMediaRecorderControl
 {

diff --git a/src/plugins/avfoundation/camera/avfvideorenderercontrol.h b/src/plugins/avfoundation/camera/avfvideorenderercontrol.h
index 367951a..b72bcd6 100644 (file)
--- a/src/plugins/avfoundation/camera/avfvideorenderercontrol.h
+++ b/src/plugins/avfoundation/camera/avfvideorenderercontrol.h
@@ -48,14 +48,14 @@
 
 #import <AVFoundation/AVFoundation.h>
 
+@class AVFCaptureFramesDelegate;
+
 QT_BEGIN_NAMESPACE
 
 class AVFCameraSession;
 class AVFCameraService;
 class AVFVideoRendererControl;
 
-@class AVFCaptureFramesDelegate;
-
 class AVFVideoRendererControl : public QVideoRendererControl
 {
 Q_OBJECT