From 21d7caa7e73cc66701da3a104dee7e925a9ab115 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 31 Aug 2021 13:19:05 +0200
Subject: Fix the canvas example to use a QML module

Change-Id: I84445909adafbd2cf0f5654fa78a005ed243536f
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit a57d3a0bebbce31ab579f3739d453baf6cacc12d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 examples/quick/canvas/CMakeLists.txt | 80 ++++++++++++------------------------
 examples/quick/canvas/canvas.qml     |  2 +-
 2 files changed, 27 insertions(+), 55 deletions(-)

(limited to 'examples')

diff --git a/examples/quick/canvas/CMakeLists.txt b/examples/quick/canvas/CMakeLists.txt
index adb446dd21..ff031fcc0a 100644
--- a/examples/quick/canvas/CMakeLists.txt
+++ b/examples/quick/canvas/CMakeLists.txt
@@ -20,72 +20,44 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Quick)
 find_package(Qt6 COMPONENTS Qml)
 
-qt_add_executable(canvas
+add_subdirectory("../shared" "shared")
+
+qt_add_executable(canvasexample
     main.cpp
 )
-set_target_properties(canvas PROPERTIES
+set_target_properties(canvasexample PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_link_libraries(canvas PUBLIC
+target_link_libraries(canvasexample PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
     Qt::Quick
 )
 
-
-# Resources:
-set(canvas_resource_files
-    "LabeledSlider.qml"
-    "bezierCurve/bezierCurve.qml"
-    "canvas.qml"
-    "clip/clip.qml"
-    "contents/qt-logo.png"
-    "quadraticCurveTo/quadraticCurveTo.qml"
-    "roundedrect/roundedrect.qml"
-    "smile/smile.qml"
-    "squircle/squircle.png"
-    "squircle/squircle.qml"
-    "tiger/tiger.js"
-    "tiger/tiger.qml"
-)
-
-qt6_add_resources(canvas "canvas"
-    PREFIX
-        "/canvas"
-    FILES
-        ${canvas_resource_files}
-)
-set(shared_resource_files
-    "../shared/Button.qml"
-    "../shared/CheckBox.qml"
-    "../shared/FlickrRssModel.qml"
-    "../shared/Label.qml"
-    "../shared/LauncherList.qml"
-    "../shared/SimpleLauncherDelegate.qml"
-    "../shared/Slider.qml"
-    "../shared/TabSet.qml"
-    "../shared/TextField.qml"
-    "../shared/images/back.png"
-    "../shared/images/checkmark.png"
-    "../shared/images/next.png"
-    "../shared/images/qt-logo.png"
-    "../shared/images/slider_handle.png"
-    "../shared/images/tab.png"
-)
-
-qt6_add_resources(canvas "shared"
-    PREFIX
-        "/shared"
-    BASE
-        "../shared"
-    FILES
-        ${shared_resource_files}
-)
-
-install(TARGETS canvas
+qt_add_qml_module(canvasexample
+    URI canvas
+    VERSION 1.0
+    QML_FILES
+        "LabeledSlider.qml"
+        "bezierCurve/bezierCurve.qml"
+        "canvas.qml"
+        "clip/clip.qml"
+        "quadraticCurveTo/quadraticCurveTo.qml"
+        "roundedrect/roundedrect.qml"
+        "smile/smile.qml"
+        "squircle/squircle.qml"
+        "tiger/tiger.js"
+        "tiger/tiger.qml"
+    RESOURCES
+        "contents/qt-logo.png"
+        "squircle/squircle.png"
+)
+
+install(TARGETS canvasexample
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
+bundle_shared(canvasexample)
diff --git a/examples/quick/canvas/canvas.qml b/examples/quick/canvas/canvas.qml
index 34e4f5a07b..6f579b55cf 100644
--- a/examples/quick/canvas/canvas.qml
+++ b/examples/quick/canvas/canvas.qml
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 import QtQuick
-import "../shared" as Examples
+import shared as Examples
 
 Item {
     height: 480
-- 
cgit v1.2.3