From 270130134175bd62a1b2e34bf8c00bd24588f69b Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 26 Apr 2017 19:01:29 +0200 Subject: iOS: Add Info.plist files to indicate camera and microphone usage Since iOS 10 the Info.plist file needs to indicate that it requires the usage of the camera and microphone in any application that requests them. So this adds Info.plist files to be used by the examples in that capacity. Change-Id: I16c6607366f57f4e950e53e1de1fbc0ac224df10 Reviewed-by: Jake Petroules --- examples/multimedia/audiodevices/audiodevices.pro | 1 + examples/multimedia/audioinput/audioinput.pro | 1 + .../multimedia/audiorecorder/audiorecorder.pro | 1 + .../declarative-camera/declarative-camera.pro | 4 +- examples/multimedia/spectrum/app/app.pro | 1 + examples/multimediawidgets/camera/camera.pro | 1 + examples/shared/shared.pri | 48 ++++++++++++++++++++++ 7 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 examples/shared/shared.pri (limited to 'examples') diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro index 71701543e..b5bcf844a 100644 --- a/examples/multimedia/audiodevices/audiodevices.pro +++ b/examples/multimedia/audiodevices/audiodevices.pro @@ -14,3 +14,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices INSTALLS += target QT+=widgets +include(../../shared/shared.pri) diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro index b0dc57c27..029ca7e0f 100644 --- a/examples/multimedia/audioinput/audioinput.pro +++ b/examples/multimedia/audioinput/audioinput.pro @@ -10,3 +10,4 @@ SOURCES = audioinput.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput INSTALLS += target +include(../../shared/shared.pri) diff --git a/examples/multimedia/audiorecorder/audiorecorder.pro b/examples/multimedia/audiorecorder/audiorecorder.pro index 79d6caf23..593c30096 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.pro +++ b/examples/multimedia/audiorecorder/audiorecorder.pro @@ -20,3 +20,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiorecorder INSTALLS += target QT+=widgets +include(../../shared/shared.pri) diff --git a/examples/multimedia/declarative-camera/declarative-camera.pro b/examples/multimedia/declarative-camera/declarative-camera.pro index f0345f1e5..6dcf42a40 100644 --- a/examples/multimedia/declarative-camera/declarative-camera.pro +++ b/examples/multimedia/declarative-camera/declarative-camera.pro @@ -6,8 +6,6 @@ QT += quick qml multimedia SOURCES += qmlcamera.cpp RESOURCES += declarative-camera.qrc -QMAKE_INFO_PLIST = Info.plist - target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/declarative-camera INSTALLS += target - +include(../../shared/shared.pri) diff --git a/examples/multimedia/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro index 76aa02cdf..17c850255 100644 --- a/examples/multimedia/spectrum/app/app.pro +++ b/examples/multimedia/spectrum/app/app.pro @@ -83,3 +83,4 @@ macx { QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN } } +include(../../../shared/shared.pri) diff --git a/examples/multimediawidgets/camera/camera.pro b/examples/multimediawidgets/camera/camera.pro index fe8f39385..acd4d9228 100644 --- a/examples/multimediawidgets/camera/camera.pro +++ b/examples/multimediawidgets/camera/camera.pro @@ -23,3 +23,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/camera INSTALLS += target QT+=widgets +include(../../shared/shared.pri) diff --git a/examples/shared/shared.pri b/examples/shared/shared.pri new file mode 100644 index 000000000..26bdf73cf --- /dev/null +++ b/examples/shared/shared.pri @@ -0,0 +1,48 @@ +darwin { + INFOPLIST = \ + "" \ + "" \ + "" \ + "" \ + " CFBundleIconFile" \ + " " \ + " CFBundlePackageType" \ + " APPL" \ + " CFBundleGetInfoString" \ + " Created by Qt/QMake" \ + " CFBundleSignature" \ + " ????" \ + " CFBundleExecutable" \ + " $$TARGET" \ + " CFBundleIdentifier" \ + " com.digia.$${LITERAL_DOLLAR}{PRODUCT_NAME:rfc1034identifier}" \ + " CFBundleDisplayName" \ + " $${LITERAL_DOLLAR}{PRODUCT_NAME}" \ + " CFBundleName" \ + " $${LITERAL_DOLLAR}{PRODUCT_NAME}" \ + " CFBundleShortVersionString" \ + " 1.0" \ + " CFBundleVersion" \ + " 1.0" \ + " LSRequiresIPhoneOS" \ + " " \ + " UILaunchStoryboardName" \ + " LaunchScreen" \ + " UISupportedInterfaceOrientations" \ + " " \ + " UIInterfaceOrientationPortrait" \ + " UIInterfaceOrientationPortraitUpsideDown" \ + " UIInterfaceOrientationLandscapeLeft" \ + " UIInterfaceOrientationLandscapeRight" \ + " " \ + " NSCameraUsageDescription" \ + " Qt Multimedia Example" \ + " NSMicrophoneUsageDescription" \ + " Qt Multimedia Example" \ + " NOTE" \ + " This file was generated by Qt/QMake." \ + "" \ + "" + write_file($$OUT_PWD/Info.plist, INFOPLIST)|error() + QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist +} -- cgit v1.2.3