diff options
| author | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2021-11-08 15:09:04 +0100 |
|---|---|---|
| committer | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2021-11-11 11:11:40 +0000 |
| commit | 28bfd773cac84d228df9e6bdcc9bed84d79935c5 (patch) | |
| tree | 38263966cf0e40c3752513b857ac1c5a7c961998 /examples/quick/mousearea/CMakeLists.txt | |
| parent | aa4897e017c027c935cd349450bf787393ce5552 (diff) | |
MouseArea example: use qt_add_qml_module() and update a signal handler
Thing patch updates the CMakeLists.txt file to use qt_add_qml_module()
instead of qt6_add_resource().
Additionally, it changes a signal handler, which was previously a plain
statement, into a js function, which is the preferred way to write signal
handlers.
Task-number: QTBUG-98130
Pick-to: 6.2
Change-Id: I1b08dcd3eae370d78587aa3d37d9456437b54b42
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'examples/quick/mousearea/CMakeLists.txt')
| -rw-r--r-- | examples/quick/mousearea/CMakeLists.txt | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/examples/quick/mousearea/CMakeLists.txt b/examples/quick/mousearea/CMakeLists.txt index 190e34b172..ea635462be 100644 --- a/examples/quick/mousearea/CMakeLists.txt +++ b/examples/quick/mousearea/CMakeLists.txt @@ -1,13 +1,9 @@ -# Generated from mousearea.pro. - cmake_minimum_required(VERSION 3.16) project(mousearea LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -15,19 +11,12 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/mousearea") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Core Gui Quick Qml) -qt_add_executable(mousearea +qt_add_executable(mouseareaexample WIN32 MACOSX_BUNDLE main.cpp ) -set_target_properties(mousearea PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(mousearea PUBLIC +target_link_libraries(mouseareaexample PUBLIC Qt::Core Qt::Gui Qt::Qml @@ -36,19 +25,15 @@ target_link_libraries(mousearea PUBLIC # Resources: -set(mousearea_resource_files - "mousearea-wheel-example.qml" - "mousearea.qml" -) - -qt6_add_resources(mousearea "mousearea" - PREFIX - "/mousearea" - FILES - ${mousearea_resource_files} +qt_add_qml_module(mouseareaexample + URI mousearea + VERSION 1.0 + QML_FILES + "mousearea-wheel-example.qml" + "mousearea.qml" ) -install(TARGETS mousearea +install(TARGETS mouseareaexample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" |