slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed AVF camera backend build with namespaced Qt

Browse Source 
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>
This commit is contained in:
Dmytro Poplavskiy
2012-08-28 13:47:30 +10:00
committed by The Qt Project
parent 9cc977668f
commit ce135bff83
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/avfoundation/camera/avfcamerasession.h
View File

@@ -47,12 +47,13 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
@class AVFCameraSessionObserver;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class AVFCameraControl; class AVFCameraControl;
class AVFCameraService; class AVFCameraService;
class AVFVideoRendererControl; class AVFVideoRendererControl;
@class AVFCameraSessionObserver;
class AVFCameraSession : public QObject class AVFCameraSession : public QObject
{ {

3
src/plugins/avfoundation/camera/avfmediarecordercontrol.h
View File

@@ -48,12 +48,13 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#include "avfstoragelocation.h" #include "avfstoragelocation.h"
@class AVFMediaRecorderDelegate;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class AVFCameraSession; class AVFCameraSession;
class AVFCameraControl; class AVFCameraControl;
class AVFCameraService; class AVFCameraService;
@class AVFMediaRecorderDelegate;
class AVFMediaRecorderControl : public QMediaRecorderControl class AVFMediaRecorderControl : public QMediaRecorderControl
{ {

4
src/plugins/avfoundation/camera/avfvideorenderercontrol.h
View File

@@ -48,14 +48,14 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
@class AVFCaptureFramesDelegate;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class AVFCameraSession; class AVFCameraSession;
class AVFCameraService; class AVFCameraService;
class AVFVideoRendererControl; class AVFVideoRendererControl;
@class AVFCaptureFramesDelegate;
class AVFVideoRendererControl : public QVideoRendererControl class AVFVideoRendererControl : public QVideoRendererControl
{ {
Q_OBJECT Q_OBJECT