Bundle application resources in QML examples

Pick-to: 6.5
Task-number: QTBUG-110329
Change-Id: I91dc271398464336e4fda1279554ce899f6319b2
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

18 files changed, 156 insertions, 224 deletions

diff --git a/examples/datavisualization/qmlaxisdrag/CMakeLists.txt b/examples/datavisualization/qmlaxisdrag/CMakeLists.txt
index 6ab6b465..e7e70916 100644
--- a/examples/datavisualization/qmlaxisdrag/CMakeLists.txt
+++ b/examples/datavisualization/qmlaxisdrag/CMakeLists.txt
@@ -37,41 +37,15 @@ target_link_libraries(qmlaxisdrag PUBLIC
     Qt::DataVisualization
 )
 
-set(qmlaxisdrag_resource_files
-    "qml/qmlaxisdrag/main.qml"
-)
-
-qt6_add_resources(qmlaxisdrag "qmlaxisdrag"
-    PREFIX
-        "/"
-    FILES
-        ${qmlaxisdrag_resource_files}
-)
-set_source_files_properties("qml/qmlaxisdrag/cube.obj"
-    PROPERTIES QT_RESOURCE_ALIAS "cube"
-)
-set(qmlaxisdrag1_resource_files
-    "qml/qmlaxisdrag/cube.obj"
-)
-
-qt6_add_resources(qmlaxisdrag "qmlaxisdrag1"
-    PREFIX
-        "/mesh"
-    FILES
-        ${qmlaxisdrag1_resource_files}
-)
-set_source_files_properties("qml/qmlaxisdrag/cubetexture.png"
-    PROPERTIES QT_RESOURCE_ALIAS "texture"
-)
-set(qmlaxisdrag2_resource_files
-    "qml/qmlaxisdrag/cubetexture.png"
-)
-
-qt6_add_resources(qmlaxisdrag "qmlaxisdrag2"
-    PREFIX
-        "/texture"
-    FILES
-        ${qmlaxisdrag2_resource_files}
+qt6_add_qml_module(qmlaxisdrag
+    URI AxisDrag
+    VERSION 1.0
+    NO_RESOURCE_TARGET_PATH
+    QML_FILES
+        qml/qmlaxisdrag/main.qml
+    RESOURCES
+        qml/qmlaxisdrag/cube.obj
+        qml/qmlaxisdrag/cubetexture.png
 )
 
 install(TARGETS qmlaxisdrag
diff --git a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
index f6142537..dc5f0802 100644
--- a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
+++ b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
@@ -50,9 +50,9 @@ Item {
         //! [10]
         onTriggered: {
             rotationAngle = rotationAngle + 1
-            qtCube.setRotationAxisAndAngle(Qt.vector3d(1,0,1), rotationAngle)
+            qtCube.setRotationAxisAndAngle(Qt.vector3d(1, 0, 1), rotationAngle)
             //! [10]
-            scatterSeries.setMeshAxisAndAngle(Qt.vector3d(1,1,1), rotationAngle)
+            scatterSeries.setMeshAxisAndAngle(Qt.vector3d(1, 1, 1), rotationAngle)
             if (isIncreasing) {
                 for (var i = 0; i < 10; i++)
                     appendRow()
@@ -135,10 +135,10 @@ Item {
             customItemList: [
                 Custom3DItem {
                     id: qtCube
-                    meshFile: ":/mesh/cube"
-                    textureFile: ":/texture/texture"
-                    position: Qt.vector3d(0.65,0.35,0.65)
-                    scaling: Qt.vector3d(0.3,0.3,0.3)
+                    meshFile: ":/qml/qmlaxisdrag/cube.obj"
+                    textureFile: ":/qml/qmlaxisdrag/cubetexture.png"
+                    position: Qt.vector3d(0.65, 0.35, 0.65)
+                    scaling: Qt.vector3d(0.3, 0.3, 0.3)
                 }
             ]
             //! [9]
diff --git a/examples/datavisualization/qmlbars/CMakeLists.txt b/examples/datavisualization/qmlbars/CMakeLists.txt
index 3998a89c..507fab60 100644
--- a/examples/datavisualization/qmlbars/CMakeLists.txt
+++ b/examples/datavisualization/qmlbars/CMakeLists.txt
@@ -41,17 +41,14 @@ target_link_libraries(qmlbars PUBLIC
     Qt::DataVisualization
 )
 
-set(qmlbars_resource_files
-    "qml/qmlbars/Axes.qml"
-    "qml/qmlbars/Data.qml"
-    "qml/qmlbars/main.qml"
-)
-
-qt6_add_resources(qmlbars "qmlbars"
-    PREFIX
-        "/"
-    FILES
-        ${qmlbars_resource_files}
+qt6_add_qml_module(qmlbars
+    URI Bars
+    VERSION 1.0
+    NO_RESOURCE_TARGET_PATH
+    QML_FILES
+        qml/qmlbars/Axes.qml
+        qml/qmlbars/Data.qml
+        qml/qmlbars/main.qml
 )
 
 install(TARGETS qmlbars
diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml b/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml
index ab427f8c..0e614760 100644
--- a/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml
+++ b/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 import QtQuick
-import QtDataVisualization 1.2
+import QtDataVisualization
 
 Item {
     property alias column: columnAxis
diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
index bdd7dc9a..2dd136b1 100644
--- a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
+++ b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts
 import QtDataVisualization
 import Qt.labs.qmlmodels
 
+pragma ComponentBehavior: Bound
+
 Item {
     id: mainview
     width: 1280
diff --git a/examples/datavisualization/qmlmultigraph/CMakeLists.txt b/examples/datavisualization/qmlmultigraph/CMakeLists.txt
index 8a3ebefb..d697e398 100644
--- a/examples/datavisualization/qmlmultigraph/CMakeLists.txt
+++ b/examples/datavisualization/qmlmultigraph/CMakeLists.txt
@@ -37,16 +37,13 @@ target_link_libraries(qmlmultigraph PUBLIC
     Qt::DataVisualization
 )
 
-set(qmlmultigraph_resource_files
-    "qml/qmlmultigraph/Data.qml"
-    "qml/qmlmultigraph/main.qml"
-)
-
-qt6_add_resources(qmlmultigraph "qmlmultigraph"
-    PREFIX
-        "/"
-    FILES
-        ${qmlmultigraph_resource_files}
+qt6_add_qml_module(qmlmultigraph
+    URI MultiGraph
+    VERSION 1.0
+    NO_RESOURCE_TARGET_PATH
+    QML_FILES
+        qml/qmlmultigraph/Data.qml
+        qml/qmlmultigraph/main.qml
 )
 
 install(TARGETS qmlmultigraph
diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
index d4b84302..2a8a03ec 100644
--- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
+++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
@@ -4,8 +4,7 @@
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtDataVisualization 1.2
-import "."
+import QtDataVisualization
 
 Item {
     id: mainView
diff --git a/examples/datavisualization/qmlscatter/CMakeLists.txt b/examples/datavisualization/qmlscatter/CMakeLists.txt
index 297bdf95..ef3c349c 100644
--- a/examples/datavisualization/qmlscatter/CMakeLists.txt
+++ b/examples/datavisualization/qmlscatter/CMakeLists.txt
@@ -37,16 +37,13 @@ target_link_libraries(qmlscatter PUBLIC
     Qt::DataVisualization
 )
 
-set(qmlscatter_resource_files
-    "qml/qmlscatter/Data.qml"
-    "qml/qmlscatter/main.qml"
-)
-
-qt6_add_resources(qmlscatter "qmlscatter"
-    PREFIX
-        "/"
-    FILES
-        ${qmlscatter_resource_files}
+qt6_add_qml_module(qmlscatter
+    URI Scatter
+    VERSION 1.0
+    NO_RESOURCE_TARGET_PATH
+    QML_FILES
+        qml/qmlscatter/Data.qml
+        qml/qmlscatter/main.qml
 )
 
 install(TARGETS qmlscatter
diff --git a/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml
index b22aaf29..ece0f0e0 100644
--- a/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml
@@ -149,7 +149,7 @@ Item {
                 text = "Use Flat for Series One";
                 scatterSeries.meshSmooth = true;
             } else {
-                text = "Use Smooth for Series One"
+                text = "Use Smooth for Series One";
                 scatterSeries.meshSmooth = false;
             }
         }
@@ -180,16 +180,14 @@ Item {
         anchors.margins: 5
         text: "Change Theme"
         onClicked: {
-            if (scatterGraph.theme.type === Theme3D.ThemeArmyBlue) {
-                scatterGraph.theme = themeIsabelle
-            } else {
-                scatterGraph.theme = themeArmyBlue
-            }
-            if (scatterGraph.theme.backgroundEnabled === true) {
+            if (scatterGraph.theme.type === Theme3D.ThemeArmyBlue)
+                scatterGraph.theme = themeIsabelle;
+            else
+                scatterGraph.theme = themeArmyBlue;
+            if (scatterGraph.theme.backgroundEnabled === true)
                 backgroundToggle.text = "Hide Background";
-            } else {
+            else
                 backgroundToggle.text = "Show Background";
-            }
         }
     }
 
diff --git a/examples/datavisualization/qmlspectrogram/CMakeLists.txt b/examples/datavisualization/qmlspectrogram/CMakeLists.txt
index c021f52e..898316bb 100644
--- a/examples/datavisualization/qmlspectrogram/CMakeLists.txt
+++ b/examples/datavisualization/qmlspectrogram/CMakeLists.txt
@@ -37,16 +37,13 @@ target_link_libraries(qmlspectrogram PUBLIC
     Qt::DataVisualization
 )
 
-set(qmlspectrogram_resource_files
-    "qml/qmlspectrogram/Data.qml"
-    "qml/qmlspectrogram/main.qml"
-)
-
-qt6_add_resources(qmlspectrogram "qmlspectrogram"
-    PREFIX
-        "/qml"
-    FILES
-        ${qmlspectrogram_resource_files}
+qt6_add_qml_module(qmlspectrogram
+    URI Spectrogram
+    VERSION 1.0
+    NO_RESOURCE_TARGET_PATH
+    QML_FILES
+        qml/qmlspectrogram/Data.qml
+        qml/qmlspectrogram/main.qml
 )
 
 install(TARGETS qmlspectrogram
diff --git a/examples/datavisualization/qmlspectrogram/main.cpp b/examples/datavisualization/qmlspectrogram/main.cpp
index 2dd68766..67430620 100644
--- a/examples/datavisualization/qmlspectrogram/main.cpp
+++ b/examples/datavisualization/qmlspectrogram/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
 #endif
     engine.addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
                                       QString::fromLatin1("qml")));
-    engine.load(QUrl(QStringLiteral("qrc:/qml/qml/qmlspectrogram/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/qml/qmlspectrogram/main.qml")));
 
     return app.exec();
 }
diff --git a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
index 141c9cd3..911159d8 100644
--- a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
+++ b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
@@ -154,12 +154,12 @@ Window {
             width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 50) / 5
             text: "Switch to\npolar"
             onClicked: {
-                if (surfaceGraph.polar === false) {
-                    surfaceGraph.polar = true
-                    text = "Switch to\ncartesian"
+                if (!surfaceGraph.polar) {
+                    surfaceGraph.polar = true;
+                    text = "Switch to\ncartesian";
                 } else {
-                    surfaceGraph.polar = false
-                    text = "Switch to\npolar"
+                    surfaceGraph.polar = false;
+                    text = "Switch to\npolar";
                 }
             }
         }
@@ -173,22 +173,23 @@ Window {
             width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 50) / 5
             text: "Switch to\nperspective"
             onClicked: {
-                if (surfaceGraph.orthoProjection === true) {
+                if (surfaceGraph.orthoProjection) {
                     surfaceGraph.orthoProjection = false;
-                    xAxis.labelAutoRotation = 30
-                    yAxis.labelAutoRotation = 30
-                    zAxis.labelAutoRotation = 30
-                    customInputHandler.rotationEnabled = true
-                    text = "Switch to\northographic"
+                    xAxis.labelAutoRotation = 30;
+                    yAxis.labelAutoRotation = 30;
+                    zAxis.labelAutoRotation = 30;
+                    customInputHandler.rotationEnabled = true;
+                    text = "Switch to\northographic";
                 } else {
                     surfaceGraph.orthoProjection = true;
-                    surfaceGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetDirectlyAbove
+                    surfaceGraph.scene.activeCamera.cameraPreset
+                        = Camera3D.CameraPresetDirectlyAbove;
                     surfaceSeries.drawMode &= ~Surface3DSeries.DrawWireframe;
-                    xAxis.labelAutoRotation = 0
-                    yAxis.labelAutoRotation = 0
-                    zAxis.labelAutoRotation = 0
-                    customInputHandler.rotationEnabled = false
-                    text = "Switch to\nperspective"
+                    xAxis.labelAutoRotation = 0;
+                    yAxis.labelAutoRotation = 0;
+                    zAxis.labelAutoRotation = 0;
+                    customInputHandler.rotationEnabled = false;
+                    text = "Switch to\nperspective";
                 }
             }
         }
@@ -201,11 +202,10 @@ Window {
             width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 50) / 5
             text: "Toggle axis\ngrid on top"
             onClicked: {
-                if (surfaceGraph.flipHorizontalGrid === true) {
+                if (surfaceGraph.flipHorizontalGrid)
                     surfaceGraph.flipHorizontalGrid = false;
-                } else {
+                else
                     surfaceGraph.flipHorizontalGrid = true;
-                }
             }
         }
 
@@ -218,11 +218,10 @@ Window {
             text: "Toggle radial\nlabel position"
             visible: surfaceGraph.polar
             onClicked: {
-                if (surfaceGraph.radialLabelOffset >= 1.0) {
-                    surfaceGraph.radialLabelOffset = 0.01
-                } else {
-                    surfaceGraph.radialLabelOffset = 1.0
-                }
+                if (surfaceGraph.radialLabelOffset >= 1.0)
+                    surfaceGraph.radialLabelOffset = 0.01;
+                else
+                    surfaceGraph.radialLabelOffset = 1.0;
             }
         }
 
@@ -240,11 +239,10 @@ Window {
             text: "Toggle\nsurface grid"
             visible: !surfaceGraph.orthoProjection
             onClicked: {
-                if (surfaceSeries.drawMode & Surface3DSeries.DrawWireframe) {
+                if (surfaceSeries.drawMode & Surface3DSeries.DrawWireframe)
                     surfaceSeries.drawMode &= ~Surface3DSeries.DrawWireframe;
-                } else {
+                else
                     surfaceSeries.drawMode |= Surface3DSeries.DrawWireframe;
-                }
             }
         }
     }
diff --git a/examples/datavisualization/qmlsurface/CMakeLists.txt b/examples/datavisualization/qmlsurface/CMakeLists.txt
index 06505650..adac2122 100644
--- a/examples/datavisualization/qmlsurface/CMakeLists.txt
+++ b/examples/datavisualization/qmlsurface/CMakeLists.txt
@@ -37,29 +37,15 @@ target_link_libraries(qmlsurface PUBLIC
     Qt::DataVisualization
 )
 
-set(qmlsurface_resource_files
-    "qml/qmlsurface/Data.qml"
-    "qml/qmlsurface/main.qml"
-)
-
-qt6_add_resources(qmlsurface "qmlsurface"
-    PREFIX
-        "/qml"
-    FILES
-        ${qmlsurface_resource_files}
-)
-set_source_files_properties("heightmap.png"
-    PROPERTIES QT_RESOURCE_ALIAS "image"
-)
-set(qmlsurface1_resource_files
-    "heightmap.png"
-)
-
-qt6_add_resources(qmlsurface "qmlsurface1"
-    PREFIX
-        "/heightmaps"
-    FILES
-        ${qmlsurface1_resource_files}
+qt6_add_qml_module(qmlsurface
+    URI Surface
+    VERSION 1.0
+    NO_RESOURCE_TARGET_PATH
+    QML_FILES
+        qml/qmlsurface/Data.qml
+        qml/qmlsurface/main.qml
+    RESOURCES
+        heightmap.png
 )
 
 install(TARGETS qmlsurface
diff --git a/examples/datavisualization/qmlsurface/main.cpp b/examples/datavisualization/qmlsurface/main.cpp
index 8f5c0696..1446eb0a 100644
--- a/examples/datavisualization/qmlsurface/main.cpp
+++ b/examples/datavisualization/qmlsurface/main.cpp
@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
     viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
                                       QString::fromLatin1("qml")));
 
-    viewer.setSource(QUrl("qrc:/qml/qml/qmlsurface/main.qml"));
+    viewer.setSource(QUrl("qrc:/qml/qmlsurface/main.qml"));
 
     viewer.setTitle(QStringLiteral("Tycho crater on the Moon (height exaggerated)"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
diff --git a/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml
index 413c6888..24151c06 100644
--- a/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml
+++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/Data.qml
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 import QtQuick
-import QtQml
-import QtQml.Models
 
 Item {
     property alias model: dataModel
diff --git a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
index e6f228f1..15994568 100644
--- a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
@@ -90,7 +90,7 @@ Rectangle {
                 visible: false
 
                 HeightMapSurfaceDataProxy {
-                    heightMapFile: ":/heightmaps/image"
+                    heightMapFile: ":/heightmap.png"
                     // We don't want the default data values set by heightmap proxy.
                     minZValue: 30
                     maxZValue: 60
@@ -144,14 +144,14 @@ Rectangle {
             onClicked: {
                 if (Qt.colorEqual(surfaceSeries.wireframeColor, "#000000")
                         && Qt.colorEqual(heightSeries.wireframeColor, "#000000")) {
-                    surfaceSeries.wireframeColor = "red"
-                    heightSeries.wireframeColor = "red"
-                    text = "Black surface\ngrid color"
+                    surfaceSeries.wireframeColor = "red";
+                    heightSeries.wireframeColor = "red";
+                    text = "Black surface\ngrid color";
                 }
                 else {
-                    surfaceSeries.wireframeColor = "black"
-                    heightSeries.wireframeColor = "black"
-                    text = "Red surface\ngrid color"
+                    surfaceSeries.wireframeColor = "black";
+                    heightSeries.wireframeColor = "black";
+                    text = "Red surface\ngrid color";
                 }
             }
         }
@@ -209,10 +209,10 @@ Rectangle {
             onClicked: {
                 if (surfacePlot.theme.backgroundEnabled === true) {
                     surfacePlot.theme.backgroundEnabled = false;
-                    text = "Show\nBackground"
+                    text = "Show\nBackground";
                 } else {
                     surfacePlot.theme.backgroundEnabled = true;
-                    text = "Hide\nBackground"
+                    text = "Hide\nBackground";
                 }
             }
         }
@@ -227,10 +227,10 @@ Rectangle {
             onClicked: {
                 if (surfacePlot.theme.gridEnabled === true) {
                     surfacePlot.theme.gridEnabled = false;
-                    text = "Show\nGrid"
+                    text = "Show\nGrid";
                 } else {
                     surfacePlot.theme.gridEnabled = true;
-                    text = "Hide\nGrid"
+                    text = "Hide\nGrid";
                 }
             }
         }
@@ -245,17 +245,17 @@ Rectangle {
             //! [3]
             onClicked: {
                 if (surfaceSeries.visible === false) {
-                    surfacePlot.axisY.max = 500.0
-                    surfaceSeries.visible = true
-                    heightSeries.visible = false
-                    middleGradient.position = 0.25
-                    text = "Switch to Height Map Series"
+                    surfacePlot.axisY.max = 500.0;
+                    surfaceSeries.visible = true;
+                    heightSeries.visible = false;
+                    middleGradient.position = 0.25;
+                    text = "Switch to Height Map Series";
                 } else {
-                    surfacePlot.axisY.max = 250.0
-                    surfaceSeries.visible = false
-                    heightSeries.visible = true
-                    middleGradient.position = 0.50
-                    text = "Switch to Item Model Series"
+                    surfacePlot.axisY.max = 250.0;
+                    surfaceSeries.visible = false;
+                    heightSeries.visible = true;
+                    middleGradient.position = 0.50;
+                    text = "Switch to Item Model Series";
                 }
             }
             //! [3]
@@ -264,13 +264,13 @@ Rectangle {
 
     function checkState() {
         if (surfaceSeries.drawMode & Surface3DSeries.DrawSurface)
-            surfaceToggle.text = "Hide\nSurface"
+            surfaceToggle.text = "Hide\nSurface";
         else
-            surfaceToggle.text = "Show\nSurface"
+            surfaceToggle.text = "Show\nSurface";
 
         if (surfaceSeries.drawMode & Surface3DSeries.DrawWireframe)
-            surfaceGridToggle.text = "Hide Surface\nGrid"
+            surfaceGridToggle.text = "Hide Surface\nGrid";
         else
-            surfaceGridToggle.text = "Show Surface\nGrid"
+            surfaceGridToggle.text = "Show Surface\nGrid";
     }
 }
diff --git a/examples/datavisualization/qmlsurfacelayers/CMakeLists.txt b/examples/datavisualization/qmlsurfacelayers/CMakeLists.txt
index bb9350fa..d31c1cbf 100644
--- a/examples/datavisualization/qmlsurfacelayers/CMakeLists.txt
+++ b/examples/datavisualization/qmlsurfacelayers/CMakeLists.txt
@@ -37,27 +37,16 @@ target_link_libraries(qmlsurfacelayers PUBLIC
     Qt::DataVisualization
 )
 
-set(qmlsurfacelayers_resource_files
-    "qml/qmlsurfacelayers/main.qml"
-)
-
-qt6_add_resources(qmlsurfacelayers "qmlsurfacelayers"
-    PREFIX
-        "/"
-    FILES
-        ${qmlsurfacelayers_resource_files}
-)
-set(qmlsurfacelayers1_resource_files
-    "layer_1.png"
-    "layer_2.png"
-    "layer_3.png"
-)
-
-qt6_add_resources(qmlsurfacelayers "qmlsurfacelayers1"
-    PREFIX
-        "/heightmaps"
-    FILES
-        ${qmlsurfacelayers1_resource_files}
+qt6_add_qml_module(qmlsurfacelayers
+    URI SurfaceLayers
+    VERSION 1.0
+    NO_RESOURCE_TARGET_PATH
+    QML_FILES
+        qml/qmlsurfacelayers/main.qml
+    RESOURCES
+        layer_1.png
+        layer_2.png
+        layer_3.png
 )
 
 install(TARGETS qmlsurfacelayers
diff --git a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
index cbf8b466..774bd3f5 100644
--- a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
+++ b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
@@ -18,7 +18,7 @@ Item {
         id: surfaceView
         width: mainview.width - settings.width
         height: mainview.height
-        anchors.right: mainview.right;
+        anchors.right: mainview.right
 
         //! [0]
         ColorGradient {
@@ -74,7 +74,7 @@ Item {
                 baseGradient: layerOneGradient
                 //! [2]
                 HeightMapSurfaceDataProxy {
-                    heightMapFile: ":/heightmaps/layer_1.png"
+                    heightMapFile: ":/layer_1.png"
                 }
                 flatShadingEnabled: false
                 drawMode: Surface3DSeries.DrawSurface
@@ -87,7 +87,7 @@ Item {
                 id: layerTwoSeries
                 baseGradient: layerTwoGradient
                 HeightMapSurfaceDataProxy {
-                    heightMapFile: ":/heightmaps/layer_2.png"
+                    heightMapFile: ":/layer_2.png"
                 }
                 flatShadingEnabled: false
                 drawMode: Surface3DSeries.DrawSurface
@@ -98,7 +98,7 @@ Item {
                 id: layerThreeSeries
                 baseGradient: layerThreeGradient
                 HeightMapSurfaceDataProxy {
-                    heightMapFile: ":/heightmaps/layer_3.png"
+                    heightMapFile: ":/layer_3.png"
                 }
                 flatShadingEnabled: false
                 drawMode: Surface3DSeries.DrawSurface
@@ -170,9 +170,9 @@ Item {
                         text: mainview.portraitMode ? "Show\nGround\nas Grid" : "Show Ground as Grid"
                         onCheckedChanged: {
                             if (checked)
-                                layerOneSeries.drawMode = Surface3DSeries.DrawWireframe
+                                layerOneSeries.drawMode = Surface3DSeries.DrawWireframe;
                             else
-                                layerOneSeries.drawMode = Surface3DSeries.DrawSurface
+                                layerOneSeries.drawMode = Surface3DSeries.DrawSurface;
                         }
                     }
 
@@ -182,9 +182,9 @@ Item {
 
                         onCheckedChanged: {
                             if (checked)
-                                layerTwoSeries.drawMode = Surface3DSeries.DrawWireframe
+                                layerTwoSeries.drawMode = Surface3DSeries.DrawWireframe;
                             else
-                                layerTwoSeries.drawMode = Surface3DSeries.DrawSurface
+                                layerTwoSeries.drawMode = Surface3DSeries.DrawSurface;
                         }
                     }
 
@@ -194,9 +194,9 @@ Item {
                                                     : "Show Tectonic as Grid"
                         onCheckedChanged: {
                             if (checked)
-                                layerThreeSeries.drawMode = Surface3DSeries.DrawWireframe
+                                layerThreeSeries.drawMode = Surface3DSeries.DrawWireframe;
                             else
-                                layerThreeSeries.drawMode = Surface3DSeries.DrawSurface
+                                layerThreeSeries.drawMode = Surface3DSeries.DrawSurface;
                         }
                     }
                 }
@@ -213,12 +213,12 @@ Item {
                     if (surfaceLayers.selectionMode & AbstractGraph3D.SelectionMultiSeries) {
                         surfaceLayers.selectionMode = AbstractGraph3D.SelectionRow
                                 | AbstractGraph3D.SelectionSlice
-                        text = mainview.portraitMode ? "Slice\nAll\nLayers" : "Slice All Layers"
+                        text = mainview.portraitMode ? "Slice\nAll\nLayers" : "Slice All Layers";
                     } else {
                         surfaceLayers.selectionMode = AbstractGraph3D.SelectionRow
                                 | AbstractGraph3D.SelectionSlice
                                 | AbstractGraph3D.SelectionMultiSeries
-                        text = mainview.portraitMode ? "Slice\nOne\nLayer" : "Slice One Layer"
+                        text = mainview.portraitMode ? "Slice\nOne\nLayer" : "Slice One Layer";
                     }
                 }
             }
@@ -233,11 +233,11 @@ Item {
                 enabled: surfaceLayers.shadowsSupported
                 onClicked: {
                     if (surfaceLayers.shadowQuality === AbstractGraph3D.ShadowQualityNone) {
-                        surfaceLayers.shadowQuality = AbstractGraph3D.ShadowQualityLow
-                        text = mainview.portraitMode ? "Hide\nShadows" : "Hide Shadows"
+                        surfaceLayers.shadowQuality = AbstractGraph3D.ShadowQualityLow;
+                        text = mainview.portraitMode ? "Hide\nShadows" : "Hide Shadows";
                     } else {
-                        surfaceLayers.shadowQuality = AbstractGraph3D.ShadowQualityNone
-                        text = mainview.portraitMode ? "Show\nShadows" : "Show Shadows"
+                        surfaceLayers.shadowQuality = AbstractGraph3D.ShadowQualityNone;
+                        text = mainview.portraitMode ? "Show\nShadows" : "Show Shadows";
                     }
                 }
             }
@@ -248,32 +248,32 @@ Item {
                 Layout.fillWidth: true
                 Layout.minimumHeight: 40
                 onClicked: {
-                    var modeText = "Indirect, "
-                    var aaText
+                    var modeText = "Indirect, ";
+                    var aaText;
                     if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
                             surfaceLayers.msaaSamples === 0) {
-                        surfaceLayers.renderingMode = AbstractGraph3D.RenderDirectToBackground
-                        modeText = "BackGround, "
+                        surfaceLayers.renderingMode = AbstractGraph3D.RenderDirectToBackground;
+                        modeText = "BackGround, ";
                     } else if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
                                surfaceLayers.msaaSamples === 4) {
-                        surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
-                        surfaceLayers.msaaSamples = 0
+                        surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect;
+                        surfaceLayers.msaaSamples = 0;
                     } else if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect &&
                                surfaceLayers.msaaSamples === 8) {
-                        surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
-                        surfaceLayers.msaaSamples = 4
+                        surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect;
+                        surfaceLayers.msaaSamples = 4;
                     } else {
-                        surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect
-                        surfaceLayers.msaaSamples = 8
+                        surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect;
+                        surfaceLayers.msaaSamples = 8;
                     }
 
                     if (surfaceLayers.msaaSamples <= 0) {
-                        aaText = "No AA"
+                        aaText = "No AA";
                     } else {
-                        aaText = surfaceLayers.msaaSamples + "xMSAA"
+                        aaText = surfaceLayers.msaaSamples + "xMSAA";
                     }
 
-                    renderLabel.text = modeText + aaText
+                    renderLabel.text = modeText + aaText;
                 }
             }