diff options
| author | Doris Verria <doris.verria@qt.io> | 2023-07-03 11:43:35 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-07-05 13:37:24 +0000 |
| commit | 0b3a4272aec5bfd6b88f1ecd33e7c87bf46406c3 (patch) | |
| tree | 4731a4a58f40bf231961f5cde1f797153a5f266f | |
| parent | 3701b3d99828394ddb6f65b93d781b18c4c3f0e5 (diff) | |
Audio example: Provide valid Info.plist dictionary
Add some missing required keys to the Info.plist dictionary
and provide valid values for both qmake and CMake files.
Ammends commit 1891ed96bf3bbaeee162a5c073ee14bd811a8ba8.
Fixes: QTBUG-114943
Change-Id: I1dcdeeb1be1ad40361c9d834790aabfd9a84725d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit bee94e4c148444f720d449e55267116bca718ced)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/charts/audio/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/charts/audio/apple/Info.cmake.plist | 43 | ||||
| -rw-r--r-- | examples/charts/audio/apple/Info.plist.in | 13 | ||||
| -rw-r--r-- | examples/charts/audio/apple/Info.qmake.plist | 43 | ||||
| -rw-r--r-- | examples/charts/audio/audio.pro | 4 |
5 files changed, 91 insertions, 14 deletions
diff --git a/examples/charts/audio/CMakeLists.txt b/examples/charts/audio/CMakeLists.txt index dd50a1fe..56ba657d 100644 --- a/examples/charts/audio/CMakeLists.txt +++ b/examples/charts/audio/CMakeLists.txt @@ -23,7 +23,7 @@ qt_add_executable(audio set_target_properties(audio PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/apple/Info.plist.in" + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/apple/Info.cmake.plist" ) target_link_libraries(audio PUBLIC diff --git a/examples/charts/audio/apple/Info.cmake.plist b/examples/charts/audio/apple/Info.cmake.plist new file mode 100644 index 00000000..788599e5 --- /dev/null +++ b/examples/charts/audio/apple/Info.cmake.plist @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + + <key>CFBundlePackageType</key> + <string>APPL</string> + + <key>CFBundleName</key> + <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string> + + <key>CFBundleDisplayName</key> + <string>${QT_INTERNAL_DOLLAR_VAR}{PRODUCT_NAME}</string> + + <key>CFBundleIdentifier</key> + <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> + + <key>CFBundleExecutable</key> + <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> + + <key>CFBundleVersion</key> + <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> + + <key>CFBundleShortVersionString</key> + <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string> + + <key>UISupportedInterfaceOrientations</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> + <string>UIInterfaceOrientationLandscapeLeft</string> + <string>UIInterfaceOrientationLandscapeRight</string> + </array> + + <key>NSMicrophoneUsageDescription</key> + <string>Qt Charts Example needs access to microphone</string> + + <key>NSSupportsAutomaticGraphicsSwitching</key> + <true/> +</dict> +</plist> diff --git a/examples/charts/audio/apple/Info.plist.in b/examples/charts/audio/apple/Info.plist.in deleted file mode 100644 index 9e6cc252..00000000 --- a/examples/charts/audio/apple/Info.plist.in +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - - <key>NSMicrophoneUsageDescription</key> - <string>Qt Charts Example</string> -</dict> -</plist> diff --git a/examples/charts/audio/apple/Info.qmake.plist b/examples/charts/audio/apple/Info.qmake.plist new file mode 100644 index 00000000..64b7e518 --- /dev/null +++ b/examples/charts/audio/apple/Info.qmake.plist @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + + <key>CFBundlePackageType</key> + <string>APPL</string> + + <key>CFBundleName</key> + <string>${PRODUCT_NAME}</string> + + <key>CFBundleDisplayName</key> + <string>${PRODUCT_NAME}</string> + + <key>CFBundleIdentifier</key> + <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> + + <key>CFBundleExecutable</key> + <string>${EXECUTABLE_NAME}</string> + + <key>CFBundleVersion</key> + <string>${QMAKE_FULL_VERSION}</string> + + <key>CFBundleShortVersionString</key> + <string>${QMAKE_SHORT_VERSION_STRING}</string> + + <key>UISupportedInterfaceOrientations</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationPortraitUpsideDown</string> + <string>UIInterfaceOrientationLandscapeLeft</string> + <string>UIInterfaceOrientationLandscapeRight</string> + </array> + + <key>NSMicrophoneUsageDescription</key> + <string>Qt Charts Example needs access to microphone</string> + + <key>NSSupportsAutomaticGraphicsSwitching</key> + <true/> +</dict> +</plist> diff --git a/examples/charts/audio/audio.pro b/examples/charts/audio/audio.pro index c6df9be0..7b3b7c40 100644 --- a/examples/charts/audio/audio.pro +++ b/examples/charts/audio/audio.pro @@ -9,5 +9,9 @@ SOURCES += \ widget.cpp \ xyseriesiodevice.cpp +darwin{ + QMAKE_INFO_PLIST = apple/Info.qmake.plist +} + target.path = $$[QT_INSTALL_EXAMPLES]/charts/audio INSTALLS += target |