diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-08-18 14:57:10 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-23 07:41:09 +0000 |
| commit | 211c56c9e5f22218423fe01b572d06d4df1ffb80 (patch) | |
| tree | 8dc7e98462e4d456d0cc41e836b52cde28002adb | |
| parent | c0c399428b73c69b85f24247e5fa56280bee39a0 (diff) | |
CMake: Update sensor_explorer example to new QML CMake API
Task-number: QTBUG-95093
Change-Id: Id53456e11225f524fb5ec40539fdc216b62ecf4e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 15474de5d882217822f49e59b315216177094034)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/sensors/sensor_explorer/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | examples/sensors/sensor_explorer/doc/src/sensor_explorer.qdoc | 9 |
2 files changed, 10 insertions, 23 deletions
diff --git a/examples/sensors/sensor_explorer/CMakeLists.txt b/examples/sensors/sensor_explorer/CMakeLists.txt index 32a2ab8a..9f37faba 100644 --- a/examples/sensors/sensor_explorer/CMakeLists.txt +++ b/examples/sensors/sensor_explorer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.16) project(sensor_explorer LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -30,16 +30,11 @@ target_link_libraries(sensor_explorer PUBLIC Qt::Sensors ) -# Resources: -set(qml_resource_files - "sensor_explorer.qml" -) - -qt6_add_resources(sensor_explorer "qml" - PREFIX - "/" - FILES - ${qml_resource_files} +qt_add_qml_module(sensor_explorer + URI SensorModels + VERSION 1.0 + QML_FILES sensor_explorer.qml + NO_RESOURCE_TARGET_PATH ) install(TARGETS sensor_explorer @@ -47,10 +42,3 @@ install(TARGETS sensor_explorer BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) - -set_target_properties(sensor_explorer PROPERTIES - QT_QML_MODULE_VERSION 1.0 - QT_QML_MODULE_URI SensorModels -) - -qt_qml_type_registration(sensor_explorer) diff --git a/examples/sensors/sensor_explorer/doc/src/sensor_explorer.qdoc b/examples/sensors/sensor_explorer/doc/src/sensor_explorer.qdoc index aef88c39..412499c9 100644 --- a/examples/sensors/sensor_explorer/doc/src/sensor_explorer.qdoc +++ b/examples/sensors/sensor_explorer/doc/src/sensor_explorer.qdoc @@ -44,11 +44,10 @@ \e CMake: \code - set_target_properties(sensor_explorer PROPERTIES - QT_QML_MODULE_VERSION 1.0 - QT_QML_MODULE_URI SensorModels + qt_add_qml_module(sensor_explorer + URI SensorModels + VERSION 1.0 ) - qt_qml_type_registration(sensor_explorer) \endcode \e qmake: @@ -58,7 +57,7 @@ QML_IMPORT_MAJOR_VERSION = 1 \endcode - The indvidual model elements are exposed as part of the model + The individual model elements are exposed as part of the model code by using the \c QML_ELEMENT macro as illustrated here: \snippet sensor_explorer/sensormodels.h 0 |