diff options
| author | Doris Verria <doris.verria@qt.io> | 2021-10-26 15:51:21 +0200 |
|---|---|---|
| committer | Doris Verria <doris.verria@qt.io> | 2021-10-28 10:25:00 +0200 |
| commit | 67fe9e4106616383ede02741cfceaec12ee1b648 (patch) | |
| tree | bc7f8c035872d82b7381899a296ac925a9ea4440 /examples/multimediawidgets/camera/CMakeLists.txt | |
| parent | f98d01cdfc968396816f1c42121f5f449ee17256 (diff) | |
Camera example: Fix .plist file to build in iOS/macOS with qmake and cmake
- Fix format error in .plist.in file which was causing the permission
dialog to not show up.
- Provide separate .plist.in files for iOS and macOS so we can set
needed keys specific to the platforms.
- For qmake builds, fix the shared.pri to provide an INFOPLIST
dictionary for macOS. The provided one has iOS specific keys.
Fixes: QTBUG-97408
Pick-to: 6.2
Change-Id: Idd8e00c91b935328352cc513f419205303d9356d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera/CMakeLists.txt')
| -rw-r--r-- | examples/multimediawidgets/camera/CMakeLists.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/examples/multimediawidgets/camera/CMakeLists.txt b/examples/multimediawidgets/camera/CMakeLists.txt index 45e06d82f..9d0f6eb7e 100644 --- a/examples/multimediawidgets/camera/CMakeLists.txt +++ b/examples/multimediawidgets/camera/CMakeLists.txt @@ -42,15 +42,21 @@ qt_add_executable(camera set_target_properties(camera PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ) +if(APPLE AND NOT IOS) + set_target_properties(camera PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in" + ) +elseif(IOS) + set_target_properties(camera PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/Info.plist.in" + ) +endif() + set_property(TARGET camera APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android) -target_include_directories(camera PUBLIC - ../../multimedia/shared -) target_link_libraries(camera PUBLIC Qt::Core Qt::Gui |