diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-08-28 13:47:30 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-09 10:50:32 +0200 |
| commit | ce135bff835866ee013d3841a4e1647a527dba8c (patch) | |
| tree | 2402f28760ec0bd6b35793d33851389b5db5604b /src/plugins/avfoundation | |
| parent | 9cc977668fc6cf1c5c9567286801569ef93537fd (diff) | |
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>
Diffstat (limited to 'src/plugins/avfoundation')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerasession.h | 3 | ||||
| -rw-r--r-- | src/plugins/avfoundation/camera/avfmediarecordercontrol.h | 3 | ||||
| -rw-r--r-- | src/plugins/avfoundation/camera/avfvideorenderercontrol.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.h b/src/plugins/avfoundation/camera/avfcamerasession.h index b2026af97..86b8a2352 100644 --- 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 651d461b1..cecc00ccc 100644 --- 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 367951a75..b72bcd6dd 100644 --- 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 |