From 48a6a8a04394c63c77259fa0c2ced34dfa0ce9fe Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@digia.com>
Date: Mon, 26 Aug 2013 15:54:52 +0200
Subject: [PATCH] AVFoundation: Basic camera support for iOS
Enables basic software rendering support for iOS.
Change-Id: Icd29076ea627295819ede6d9680de576ba39b34e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
---
src/plugins/avfoundation/avfoundation.pro | 5 ++---
src/plugins/avfoundation/camera/camera.pro | 10 +++++++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/plugins/avfoundation/avfoundation.pro b/src/plugins/avfoundation/avfoundation.pro
index 48ad0a56a..c05331d20 100644
--- a/src/plugins/avfoundation/avfoundation.pro
+++ b/src/plugins/avfoundation/avfoundation.pro
@@ -1,5 +1,4 @@
TEMPLATE = subdirs
-!ios: SUBDIRS += camera
-
-SUBDIRS += mediaplayer
+SUBDIRS += mediaplayer \
+ camera
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro
index 3c7511715..791ab8c48 100644
--- a/src/plugins/avfoundation/camera/camera.pro
+++ b/src/plugins/avfoundation/camera/camera.pro
@@ -8,10 +8,14 @@ PLUGIN_TYPE = mediaservice
PLUGIN_CLASS_NAME = AVFServicePlugin
load(qt_plugin)
-LIBS += -framework AppKit -framework AudioUnit \
- -framework AudioToolbox -framework CoreAudio \
- -framework QuartzCore -framework AVFoundation \
+LIBS += -framework AudioToolbox \
+ -framework CoreAudio \
+ -framework QuartzCore \
+ -framework AVFoundation \
-framework CoreMedia
+osx:LIBS += -framework AppKit \
+ -framework AudioUnit
+ios:LIBS += -framework CoreVideo
OTHER_FILES += avfcamera.json
--
GitLab