Automotive example: Use qt_add_qml_module()

Task-number: QTBUG-98130
Change-Id: I18e45ab63e0cab8611b4274e2d312db12fc9775d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit fc7854702705ae04f1ffd57685b20e21791b2cb3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 115 insertions, 158 deletions

diff --git a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt b/examples/quickcontrols2/imagine/automotive/CMakeLists.txt
index 6316a61616..98b0af0668 100644
--- a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt
+++ b/examples/quickcontrols2/imagine/automotive/CMakeLists.txt
@@ -11,175 +11,132 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/imagine/automotive
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2)
 
-qt_add_executable(automotive
+qt_add_executable(automotiveexample WIN32 MACOSX_BUNDLE
     automotive.cpp
 )
 
-set_target_properties(automotive PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
+qt_add_qml_module(automotiveexample
+    URI automotive
+    VERSION 1.0
+    NO_RESOURCE_TARGET_PATH
+    QML_FILES
+        "qml/FeatureButton.qml"
+        "qml/LargeLabel.qml"
+        "qml/automotive.qml"
+
+    RESOURCES
+        "icons/automotive/44x44/air-con.png"
+        "icons/automotive/44x44/command.png"
+        "icons/automotive/44x44/message.png"
+        "icons/automotive/44x44/music.png"
+        "icons/automotive/44x44/seats.png"
+        "icons/automotive/44x44/settings.png"
+        "icons/automotive/44x44/statistics.png"
+        "icons/automotive/44x44/windows.png"
+        "icons/automotive/44x44@2/air-con.png"
+        "icons/automotive/44x44@2/command.png"
+        "icons/automotive/44x44@2/message.png"
+        "icons/automotive/44x44@2/music.png"
+        "icons/automotive/44x44@2/navigation.png"
+        "icons/automotive/44x44@2/seats.png"
+        "icons/automotive/44x44@2/settings.png"
+        "icons/automotive/44x44@2/statistics.png"
+        "icons/automotive/44x44@2/windows.png"
+        "icons/automotive/icons.svg"
+        "icons/automotive/index.theme"
+        "icons/car.png"
+        "icons/car@2x.png"
+        "icons/warning.png"
+        "icons/warning@2x.png"
+        "icons/weather.png"
+        "icons/weather@2x.png"
+        "imagine-assets/applicationwindow-background.png"
+        "imagine-assets/applicationwindow-background@2x.png"
+        "imagine-assets/button-background-checked-hovered.9.png"
+        "imagine-assets/button-background-checked-hovered@2x.9.png"
+        "imagine-assets/button-background-checked.9.png"
+        "imagine-assets/button-background-checked@2x.9.png"
+        "imagine-assets/button-background-hovered.9.png"
+        "imagine-assets/button-background-hovered@2x.9.png"
+        "imagine-assets/button-background-pressed.9.png"
+        "imagine-assets/button-background-pressed@2x.9.png"
+        "imagine-assets/button-background.9.png"
+        "imagine-assets/button-background@2x.9.png"
+        "imagine-assets/dial-background-hovered.png"
+        "imagine-assets/dial-background-hovered@2x.png"
+        "imagine-assets/dial-background-pressed.png"
+        "imagine-assets/dial-background-pressed@2x.png"
+        "imagine-assets/dial-background.png"
+        "imagine-assets/dial-background@2x.png"
+        "imagine-assets/dial-handle-pressed.png"
+        "imagine-assets/dial-handle-pressed@2x.png"
+        "imagine-assets/dial-handle.png"
+        "imagine-assets/dial-handle@2x.png"
+        "imagine-assets/frame-background.9.png"
+        "imagine-assets/frame-background@2x.9.png"
+        "imagine-assets/itemdelegate-background-checked.9.png"
+        "imagine-assets/itemdelegate-background-checked@2x.9.png"
+        "imagine-assets/itemdelegate-background-hovered.9.png"
+        "imagine-assets/itemdelegate-background-hovered@2x.9.png"
+        "imagine-assets/itemdelegate-background-pressed.9.png"
+        "imagine-assets/itemdelegate-background-pressed@2x.9.png"
+        "imagine-assets/itemdelegate-background.9.png"
+        "imagine-assets/itemdelegate-background@2x.9.png"
+        "imagine-assets/radiobutton-indicator-checked-hovered.png"
+        "imagine-assets/radiobutton-indicator-checked-hovered@2x.png"
+        "imagine-assets/radiobutton-indicator-checked-pressed.png"
+        "imagine-assets/radiobutton-indicator-checked-pressed@2x.png"
+        "imagine-assets/radiobutton-indicator-checked.png"
+        "imagine-assets/radiobutton-indicator-checked@2x.png"
+        "imagine-assets/radiobutton-indicator-hovered.png"
+        "imagine-assets/radiobutton-indicator-hovered@2x.png"
+        "imagine-assets/radiobutton-indicator-pressed.png"
+        "imagine-assets/radiobutton-indicator-pressed@2x.png"
+        "imagine-assets/radiobutton-indicator.png"
+        "imagine-assets/radiobutton-indicator@2x.png"
+        "imagine-assets/scrollindicator-handle.png"
+        "imagine-assets/scrollindicator-handle@2x.png"
+        "imagine-assets/slider-background-horizontal.9.png"
+        "imagine-assets/slider-background-horizontal@2x.9.png"
+        "imagine-assets/slider-handle-hovered.png"
+        "imagine-assets/slider-handle-hovered@2x.png"
+        "imagine-assets/slider-handle-pressed.png"
+        "imagine-assets/slider-handle-pressed@2x.png"
+        "imagine-assets/slider-handle.png"
+        "imagine-assets/slider-handle@2x.png"
+        "imagine-assets/slider-progress-horizontal-pressed.9.png"
+        "imagine-assets/slider-progress-horizontal-pressed@2x.9.png"
+        "imagine-assets/slider-progress-horizontal.9.png"
+        "imagine-assets/slider-progress-horizontal@2x.9.png"
+        "imagine-assets/switchdelegate-background.9.png"
+        "imagine-assets/switchdelegate-background@2x.9.png"
+        "imagine-assets/switchdelegate-handle-checked-hovered.png"
+        "imagine-assets/switchdelegate-handle-checked-hovered@2x.png"
+        "imagine-assets/switchdelegate-handle-checked.png"
+        "imagine-assets/switchdelegate-handle-checked@2x.png"
+        "imagine-assets/switchdelegate-handle-hovered.png"
+        "imagine-assets/switchdelegate-handle-hovered@2x.png"
+        "imagine-assets/switchdelegate-handle-pressed.png"
+        "imagine-assets/switchdelegate-handle-pressed@2x.png"
+        "imagine-assets/switchdelegate-handle.png"
+        "imagine-assets/switchdelegate-handle@2x.png"
+        "imagine-assets/switchdelegate-indicator-pressed.png"
+        "imagine-assets/switchdelegate-indicator-pressed@2x.png"
+        "imagine-assets/switchdelegate-indicator.png"
+        "imagine-assets/switchdelegate-indicator@2x.png"
+        "imagine-assets/toolseparator-separator-vertical.9.png"
+        "imagine-assets/toolseparator-separator-vertical@2x.9.png"
+        "qtquickcontrols2.conf"
 )
 
-target_link_libraries(automotive PUBLIC
+target_link_libraries(automotiveexample PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Quick
     Qt::QuickControls2
 )
 
-# Resources:
-set(icons_resource_files
-    "icons/automotive/44x44/air-con.png"
-    "icons/automotive/44x44/command.png"
-    "icons/automotive/44x44/message.png"
-    "icons/automotive/44x44/music.png"
-    "icons/automotive/44x44/seats.png"
-    "icons/automotive/44x44/settings.png"
-    "icons/automotive/44x44/statistics.png"
-    "icons/automotive/44x44/windows.png"
-    "icons/automotive/44x44@2/air-con.png"
-    "icons/automotive/44x44@2/command.png"
-    "icons/automotive/44x44@2/message.png"
-    "icons/automotive/44x44@2/music.png"
-    "icons/automotive/44x44@2/navigation.png"
-    "icons/automotive/44x44@2/seats.png"
-    "icons/automotive/44x44@2/settings.png"
-    "icons/automotive/44x44@2/statistics.png"
-    "icons/automotive/44x44@2/windows.png"
-    "icons/automotive/icons.svg"
-    "icons/automotive/index.theme"
-    "icons/car.png"
-    "icons/car@2x.png"
-    "icons/warning.png"
-    "icons/warning@2x.png"
-    "icons/weather.png"
-    "icons/weather@2x.png"
-)
-
-qt6_add_resources(automotive "icons"
-    PREFIX
-        "/icons"
-    BASE
-        "icons"
-    FILES
-        ${icons_resource_files}
-)
-
-set(imagine-assets_resource_files
-    "imagine-assets/applicationwindow-background.png"
-    "imagine-assets/applicationwindow-background@2x.png"
-    "imagine-assets/button-background-checked-hovered.9.png"
-    "imagine-assets/button-background-checked-hovered@2x.9.png"
-    "imagine-assets/button-background-checked.9.png"
-    "imagine-assets/button-background-checked@2x.9.png"
-    "imagine-assets/button-background-hovered.9.png"
-    "imagine-assets/button-background-hovered@2x.9.png"
-    "imagine-assets/button-background-pressed.9.png"
-    "imagine-assets/button-background-pressed@2x.9.png"
-    "imagine-assets/button-background.9.png"
-    "imagine-assets/button-background@2x.9.png"
-    "imagine-assets/dial-background-hovered.png"
-    "imagine-assets/dial-background-hovered@2x.png"
-    "imagine-assets/dial-background-pressed.png"
-    "imagine-assets/dial-background-pressed@2x.png"
-    "imagine-assets/dial-background.png"
-    "imagine-assets/dial-background@2x.png"
-    "imagine-assets/dial-handle-pressed.png"
-    "imagine-assets/dial-handle-pressed@2x.png"
-    "imagine-assets/dial-handle.png"
-    "imagine-assets/dial-handle@2x.png"
-    "imagine-assets/frame-background.9.png"
-    "imagine-assets/frame-background@2x.9.png"
-    "imagine-assets/itemdelegate-background-checked.9.png"
-    "imagine-assets/itemdelegate-background-checked@2x.9.png"
-    "imagine-assets/itemdelegate-background-hovered.9.png"
-    "imagine-assets/itemdelegate-background-hovered@2x.9.png"
-    "imagine-assets/itemdelegate-background-pressed.9.png"
-    "imagine-assets/itemdelegate-background-pressed@2x.9.png"
-    "imagine-assets/itemdelegate-background.9.png"
-    "imagine-assets/itemdelegate-background@2x.9.png"
-    "imagine-assets/radiobutton-indicator-checked-hovered.png"
-    "imagine-assets/radiobutton-indicator-checked-hovered@2x.png"
-    "imagine-assets/radiobutton-indicator-checked-pressed.png"
-    "imagine-assets/radiobutton-indicator-checked-pressed@2x.png"
-    "imagine-assets/radiobutton-indicator-checked.png"
-    "imagine-assets/radiobutton-indicator-checked@2x.png"
-    "imagine-assets/radiobutton-indicator-hovered.png"
-    "imagine-assets/radiobutton-indicator-hovered@2x.png"
-    "imagine-assets/radiobutton-indicator-pressed.png"
-    "imagine-assets/radiobutton-indicator-pressed@2x.png"
-    "imagine-assets/radiobutton-indicator.png"
-    "imagine-assets/radiobutton-indicator@2x.png"
-    "imagine-assets/scrollindicator-handle.png"
-    "imagine-assets/scrollindicator-handle@2x.png"
-    "imagine-assets/slider-background-horizontal.9.png"
-    "imagine-assets/slider-background-horizontal@2x.9.png"
-    "imagine-assets/slider-handle-hovered.png"
-    "imagine-assets/slider-handle-hovered@2x.png"
-    "imagine-assets/slider-handle-pressed.png"
-    "imagine-assets/slider-handle-pressed@2x.png"
-    "imagine-assets/slider-handle.png"
-    "imagine-assets/slider-handle@2x.png"
-    "imagine-assets/slider-progress-horizontal-pressed.9.png"
-    "imagine-assets/slider-progress-horizontal-pressed@2x.9.png"
-    "imagine-assets/slider-progress-horizontal.9.png"
-    "imagine-assets/slider-progress-horizontal@2x.9.png"
-    "imagine-assets/switchdelegate-background.9.png"
-    "imagine-assets/switchdelegate-background@2x.9.png"
-    "imagine-assets/switchdelegate-handle-checked-hovered.png"
-    "imagine-assets/switchdelegate-handle-checked-hovered@2x.png"
-    "imagine-assets/switchdelegate-handle-checked.png"
-    "imagine-assets/switchdelegate-handle-checked@2x.png"
-    "imagine-assets/switchdelegate-handle-hovered.png"
-    "imagine-assets/switchdelegate-handle-hovered@2x.png"
-    "imagine-assets/switchdelegate-handle-pressed.png"
-    "imagine-assets/switchdelegate-handle-pressed@2x.png"
-    "imagine-assets/switchdelegate-handle.png"
-    "imagine-assets/switchdelegate-handle@2x.png"
-    "imagine-assets/switchdelegate-indicator-pressed.png"
-    "imagine-assets/switchdelegate-indicator-pressed@2x.png"
-    "imagine-assets/switchdelegate-indicator.png"
-    "imagine-assets/switchdelegate-indicator@2x.png"
-    "imagine-assets/toolseparator-separator-vertical.9.png"
-    "imagine-assets/toolseparator-separator-vertical@2x.9.png"
-)
-
-qt6_add_resources(automotive "imagine-assets"
-    PREFIX
-        "/imagine-assets"
-    BASE
-        "imagine-assets"
-    FILES
-        ${imagine-assets_resource_files}
-)
-
-set(qml_resource_files
-    "qml/FeatureButton.qml"
-    "qml/LargeLabel.qml"
-    "qml/automotive.qml"
-)
-
-qt6_add_resources(automotive "qml"
-    PREFIX
-        "/qml"
-    BASE
-        "qml"
-    FILES
-        ${qml_resource_files}
-)
-
-set(qmake_immediate_resource_files
-    "qtquickcontrols2.conf"
-)
-
-qt6_add_resources(automotive "qmake_immediate"
-    PREFIX
-        "/"
-    FILES
-        ${qmake_immediate_resource_files}
-)
-
-install(TARGETS automotive
+install(TARGETS automotiveexample
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"