summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2017-04-26 19:01:29 +0200
committerAndy Shaw <andy.shaw@qt.io>2017-04-28 17:34:14 +0000
commit270130134175bd62a1b2e34bf8c00bd24588f69b (patch)
tree44de2f1fa79459a1d10365804134b3eb5ab07563 /examples
parentb9bfe241cc3c3466ad250da80b2a7ccf087706a4 (diff)
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 <jake.petroules@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/multimedia/audiodevices/audiodevices.pro1
-rw-r--r--examples/multimedia/audioinput/audioinput.pro1
-rw-r--r--examples/multimedia/audiorecorder/audiorecorder.pro1
-rw-r--r--examples/multimedia/declarative-camera/declarative-camera.pro4
-rw-r--r--examples/multimedia/spectrum/app/app.pro1
-rw-r--r--examples/multimediawidgets/camera/camera.pro1
-rw-r--r--examples/shared/shared.pri48
7 files changed, 54 insertions, 3 deletions
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 = \
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" \
+ "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" \
+ "<plist version=\"1.0\">" \
+ "<dict>" \
+ " <key>CFBundleIconFile</key>" \
+ " <string></string>" \
+ " <key>CFBundlePackageType</key>" \
+ " <string>APPL</string>" \
+ " <key>CFBundleGetInfoString</key>" \
+ " <string>Created by Qt/QMake</string>" \
+ " <key>CFBundleSignature</key>" \
+ " <string>????</string>" \
+ " <key>CFBundleExecutable</key>" \
+ " <string>$$TARGET</string>" \
+ " <key>CFBundleIdentifier</key>" \
+ " <string>com.digia.$${LITERAL_DOLLAR}{PRODUCT_NAME:rfc1034identifier}</string>" \
+ " <key>CFBundleDisplayName</key>" \
+ " <string>$${LITERAL_DOLLAR}{PRODUCT_NAME}</string>" \
+ " <key>CFBundleName</key>" \
+ " <string>$${LITERAL_DOLLAR}{PRODUCT_NAME}</string>" \
+ " <key>CFBundleShortVersionString</key>" \
+ " <string>1.0</string>" \
+ " <key>CFBundleVersion</key>" \
+ " <string>1.0</string>" \
+ " <key>LSRequiresIPhoneOS</key>" \
+ " <true/>" \
+ " <key>UILaunchStoryboardName</key>" \
+ " <string>LaunchScreen</string>" \
+ " <key>UISupportedInterfaceOrientations</key>" \
+ " <array>" \
+ " <string>UIInterfaceOrientationPortrait</string>" \
+ " <string>UIInterfaceOrientationPortraitUpsideDown</string>" \
+ " <string>UIInterfaceOrientationLandscapeLeft</string>" \
+ " <string>UIInterfaceOrientationLandscapeRight</string>" \
+ " </array>" \
+ " <key>NSCameraUsageDescription</key>" \
+ " <string>Qt Multimedia Example</string>" \
+ " <key>NSMicrophoneUsageDescription</key>" \
+ " <string>Qt Multimedia Example</string>" \
+ " <key>NOTE</key>" \
+ " <string>This file was generated by Qt/QMake.</string>" \
+ "</dict>" \
+ "</plist>"
+ write_file($$OUT_PWD/Info.plist, INFOPLIST)|error()
+ QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist
+}