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>

diff --git a/src/plugins/avfoundation/avfoundation.pro b/src/plugins/avfoundation/avfoundation.pro
index 48ad0a5..c05331d 100644 (file)
--- 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 3c75117..791ab8c 100644 (file)
--- 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