diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-08-29 20:40:40 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-08-30 11:30:29 +0300 |
commit | 62454915c3293c5d5825709ad4e1938148b0223f (patch) | |
tree | f4f625739d1392f5af59a9635d080d1dcf8a7f2d /examples/multimediawidgets/camera/CMakeLists.txt | |
parent | a9a0380f6d75f414491b7e940a9d4e647cdd58a0 (diff) |
make widgets camera example mobile friendly
Put the controls on the button of the screen and lock the view on
portrait mode on Android.
Task-number: QTBUG-96077
Pick-to: 6.2
Change-Id: Ib09068723d892285cc15dd0ef5a708a21220abdd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera/CMakeLists.txt')
-rw-r--r-- | examples/multimediawidgets/camera/CMakeLists.txt | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/examples/multimediawidgets/camera/CMakeLists.txt b/examples/multimediawidgets/camera/CMakeLists.txt index c8cc8fad7..45e06d82f 100644 --- a/examples/multimediawidgets/camera/CMakeLists.txt +++ b/examples/multimediawidgets/camera/CMakeLists.txt @@ -21,11 +21,22 @@ find_package(Qt6 COMPONENTS Multimedia) find_package(Qt6 COMPONENTS MultimediaWidgets) find_package(Qt6 COMPONENTS Widgets) +set(camera_form "") +set(videosettings_form "") +if(ANDROID OR IOS) + set(camera_form camera_mobile.ui) + set(videosettings_form videosettings_mobile.ui) +else() + set(camera_form camera.ui) + set(videosettings_form videosettings.ui) +endif() + qt_add_executable(camera - camera.cpp camera.h camera.ui + MANUAL_FINALIZATION + camera.cpp camera.h ${camera_form} imagesettings.cpp imagesettings.h imagesettings.ui main.cpp - videosettings.cpp videosettings.h videosettings.ui + videosettings.cpp videosettings.h ${videosettings_form} metadatadialog.cpp metadatadialog.h ) set_target_properties(camera PROPERTIES @@ -33,6 +44,10 @@ set_target_properties(camera PROPERTIES MACOSX_BUNDLE TRUE MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ) + +set_property(TARGET camera APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/android) + target_include_directories(camera PUBLIC ../../multimedia/shared ) @@ -57,6 +72,8 @@ qt6_add_resources(camera "camera" ${camera_resource_files} ) +qt_finalize_executable(camera) + install(TARGETS camera RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" |