diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:27:51 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:30:08 +0100 |
commit | d3a2d9c96994c56d67467c131b8f080510d1a8fd (patch) | |
tree | 088c55da965b1fb6bb327b2821afc4755eab8117 /examples | |
parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
parent | 75b4283fb05d07fb8654e031f266e9918f1ae647 (diff) | |
download | qtmultimedia-d3a2d9c96994c56d67467c131b8f080510d1a8fd.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
Diffstat (limited to 'examples')
-rw-r--r-- | examples/multimedia/declarative-camera/Info.plist | 41 | ||||
-rw-r--r-- | examples/multimedia/declarative-camera/declarative-camera.pro | 2 | ||||
-rw-r--r-- | examples/multimedia/video/qmlvideofx/Info.plist | 2 |
3 files changed, 45 insertions, 0 deletions
diff --git a/examples/multimedia/declarative-camera/Info.plist b/examples/multimedia/declarative-camera/Info.plist new file mode 100644 index 000000000..462df2ae0 --- /dev/null +++ b/examples/multimedia/declarative-camera/Info.plist @@ -0,0 +1,41 @@ +<?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>declarative-camera</string> + <key>CFBundleIdentifier</key> + <string>com.qt-company.${PRODUCT_NAME:rfc1034identifier}</string> + <key>CFBundleDisplayName</key> + <string>${PRODUCT_NAME}</string> + <key>CFBundleName</key> + <string>${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>NOTE</key> + <string>This file was generated by Qt/QMake.</string> + <key>NSCameraUsageDescription</key> + <string>Qt Multimedia Example</string> +</dict> +</plist> diff --git a/examples/multimedia/declarative-camera/declarative-camera.pro b/examples/multimedia/declarative-camera/declarative-camera.pro index 71d4f68b0..f0345f1e5 100644 --- a/examples/multimedia/declarative-camera/declarative-camera.pro +++ b/examples/multimedia/declarative-camera/declarative-camera.pro @@ -6,6 +6,8 @@ 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 diff --git a/examples/multimedia/video/qmlvideofx/Info.plist b/examples/multimedia/video/qmlvideofx/Info.plist index 8fc242516..5fbe35f1c 100644 --- a/examples/multimedia/video/qmlvideofx/Info.plist +++ b/examples/multimedia/video/qmlvideofx/Info.plist @@ -26,5 +26,7 @@ <string>1.0</string> <key>CFBundleVersion</key> <string>1.0</string> + <key>NSCameraUsageDescription</key> + <string>Qt Multimedia Example</string> </dict> </plist> |