diff options
| author | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2022-09-22 14:56:01 +0200 |
|---|---|---|
| committer | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2022-09-26 00:16:47 +0200 |
| commit | aaab4e797a728538e23a6695eb3edfef756f2669 (patch) | |
| tree | aaef7c6e8133c2be9f636d122b08ff5a67c922ae /examples | |
| parent | 316310158bb51edbe813f15742b165b0e69c95ab (diff) | |
SidePanel example: use qt_add_qml_module() in CMakeLists.txt
This patch replaces the usage of qt_add_resources() with
qt_add_qml_module()
Task-number: QTBUG-98130
Pick-to: 6.4 6.2
Change-Id: I31ef1bd0c725fe741c8505fa1620801195e46eeb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quickcontrols2/sidepanel/CMakeLists.txt | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/examples/quickcontrols2/sidepanel/CMakeLists.txt b/examples/quickcontrols2/sidepanel/CMakeLists.txt index e7e74330e3..7a832eda13 100644 --- a/examples/quickcontrols2/sidepanel/CMakeLists.txt +++ b/examples/quickcontrols2/sidepanel/CMakeLists.txt @@ -14,41 +14,33 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/sidepanel") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick) -qt_add_executable(sidepanel +qt_add_executable(sidepanelexample WIN32 MACOSX_BUNDLE sidepanel.cpp ) -set_target_properties(sidepanel PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE +qt_add_qml_module(sidepanelexample + URI sidepanel + VERSION 1.0 + NO_RESOURCE_TARGET_PATH + QML_FILES + "sidepanel.qml" + RESOURCES + "images/qt-logo.png" + "images/qt-logo@2x.png" + "images/qt-logo@3x.png" + "images/qt-logo@4x.png" + "qtquickcontrols2.conf" + "doc/images/qtquickcontrols2-sidepanel-landscape.png" + "doc/images/qtquickcontrols2-sidepanel-portrait.png" ) -target_link_libraries(sidepanel PUBLIC +target_link_libraries(sidepanelexample PUBLIC Qt::Core Qt::Gui Qt::Quick ) -# Resources: -set(qmake_immediate_resource_files - "doc/images/qtquickcontrols2-sidepanel-landscape.png" - "doc/images/qtquickcontrols2-sidepanel-portrait.png" - "images/qt-logo.png" - "images/qt-logo@2x.png" - "images/qt-logo@3x.png" - "images/qt-logo@4x.png" - "qtquickcontrols2.conf" - "sidepanel.qml" -) - -qt6_add_resources(sidepanel "qmake_immediate" - PREFIX - "/" - FILES - ${qmake_immediate_resource_files} -) - -install(TARGETS sidepanel +install(TARGETS sidepanelexample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" |