From 7a5b71b9b8092a73ecfdf22dd28a4f45110204aa Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 13 Jan 2022 17:15:03 +0100 Subject: [PATCH] Doc: Update CMakeLists.txt files used in Qt Quick tutorials ...to the ones created by version 7.0 wizard templates. Task-number: QTCREATORBUG-26610 Change-Id: I67409b5ba4800199f209d9ad1a85c6657e9210df Reviewed-by: Reviewed-by: Assam Boudjelthia Reviewed-by: Alessandro Portale --- .../examples/accelbubble/CMakeLists.txt | 20 +++++++++++++------ .../examples/transitions/CMakeLists.txt | 8 ++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/doc/qtcreator/examples/accelbubble/CMakeLists.txt b/doc/qtcreator/examples/accelbubble/CMakeLists.txt index 1c22ae9afcf..5210b67a25f 100644 --- a/doc/qtcreator/examples/accelbubble/CMakeLists.txt +++ b/doc/qtcreator/examples/accelbubble/CMakeLists.txt @@ -11,12 +11,7 @@ qt_add_executable(appaccelbubble main.cpp MANUAL_FINALIZATION ) -set_target_properties(appaccelbubble PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" -) -set_property(TARGET appaccelbubble APPEND PROPERTY - QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android -) + qt_add_qml_module(appaccelbubble URI accelbubble VERSION 1.0 @@ -24,6 +19,19 @@ qt_add_qml_module(appaccelbubble RESOURCES Bluebubble.svg ) +set_target_properties(appaccelbubble PROPERTIES + MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com + MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" + MACOSX_BUNDLE TRUE + WIN32_EXECUTABLE TRUE +) + +set_property(TARGET appaccelbubble APPEND PROPERTY + QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android +) + target_compile_definitions(appaccelbubble PRIVATE $<$,$>:QT_QML_DEBUG>) target_link_libraries(appaccelbubble diff --git a/doc/qtcreator/examples/transitions/CMakeLists.txt b/doc/qtcreator/examples/transitions/CMakeLists.txt index 64b33846ff7..1ebc965be55 100644 --- a/doc/qtcreator/examples/transitions/CMakeLists.txt +++ b/doc/qtcreator/examples/transitions/CMakeLists.txt @@ -18,6 +18,14 @@ qt_add_qml_module(apptransitions RESOURCES qt-logo.png ) +set_target_properties(apptransitions PROPERTIES + MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com + MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} + MACOSX_BUNDLE TRUE + WIN32_EXECUTABLE TRUE +) + target_compile_definitions(apptransitions PRIVATE $<$,$>:QT_QML_DEBUG>) target_link_libraries(apptransitions