Fix touchinteraction example to use QML modules

Remove the "content" subdirectories. They just add noise.

Change-Id: Iae6bf7d91b6804294673be8966e30b11caae0654
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 76a413bb11dd444239d3e0ae5fc86a3021d53409)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

24 files changed, 55 insertions, 85 deletions

diff --git a/examples/quick/touchinteraction/CMakeLists.txt b/examples/quick/touchinteraction/CMakeLists.txt
index 48c857758a..a5dd1416ba 100644
--- a/examples/quick/touchinteraction/CMakeLists.txt
+++ b/examples/quick/touchinteraction/CMakeLists.txt
@@ -20,82 +20,54 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Quick)
 find_package(Qt6 COMPONENTS Qml)
 
-qt_add_executable(touchinteraction
+add_subdirectory("../shared" "shared")
+
+qt_add_executable(touchinteractionexample
     main.cpp
 )
-set_target_properties(touchinteraction PROPERTIES
+set_target_properties(touchinteractionexample PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_link_libraries(touchinteraction PUBLIC
+target_link_libraries(touchinteractionexample PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
     Qt::Quick
+    touchinteraction_shared
 )
 
-
-# Resources:
-set(touchinteraction_resource_files
-    "flickable/basic-flickable.qml"
-    "flickable/content/Panel.qml"
-    "flickable/content/cork.jpg"
-    "flickable/content/note-yellow.png"
-    "flickable/content/tack.png"
-    "flickable/corkboards.qml"
-    "multipointtouch/bearwhack.qml"
-    "multipointtouch/content/AugmentedTouchPoint.qml"
-    "multipointtouch/content/Bear0.png"
-    "multipointtouch/content/Bear1.png"
-    "multipointtouch/content/Bear2.png"
-    "multipointtouch/content/Bear3.png"
-    "multipointtouch/content/BearB.png"
-    "multipointtouch/content/BearWhackParticleSystem.qml"
-    "multipointtouch/content/ParticleFlame.qml"
-    "multipointtouch/content/blur-circle.png"
-    "multipointtouch/content/blur-circle3.png"
-    "multipointtouch/content/heart-blur.png"
-    "multipointtouch/content/title.png"
-    "multipointtouch/multiflame.qml"
-    "pincharea/flickresize.qml"
-    "pincharea/qt-logo.jpg"
-    "touchinteraction.qml"
-)
-
-qt6_add_resources(touchinteraction "touchinteraction"
-    PREFIX
-        "/touchinteraction"
-    FILES
-        ${touchinteraction_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(touchinteraction "shared"
-    PREFIX
-        "/shared"
-    BASE
-        "../shared"
-    FILES
-        ${shared_resource_files}
+qt_add_qml_module(touchinteractionexample
+    URI touchinteraction
+    VERSION 1.0
+    QML_FILES
+        "flickable/Panel.qml"
+        "flickable/basic-flickable.qml"
+        "flickable/corkboards.qml"
+        "multipointtouch/AugmentedTouchPoint.qml"
+        "multipointtouch/BearWhackParticleSystem.qml"
+        "multipointtouch/ParticleFlame.qml"
+        "multipointtouch/bearwhack.qml"
+        "multipointtouch/multiflame.qml"
+        "pincharea/flickresize.qml"
+        "touchinteraction.qml"
+    RESOURCES
+        "flickable/cork.jpg"
+        "flickable/note-yellow.png"
+        "flickable/tack.png"
+        "multipointtouch/Bear0.png"
+        "multipointtouch/Bear1.png"
+        "multipointtouch/Bear2.png"
+        "multipointtouch/Bear3.png"
+        "multipointtouch/BearB.png"
+        "multipointtouch/blur-circle.png"
+        "multipointtouch/blur-circle3.png"
+        "multipointtouch/heart-blur.png"
+        "multipointtouch/title.png"
+        "pincharea/qt-logo.jpg"
 )
 
-install(TARGETS touchinteraction
+install(TARGETS touchinteractionexample
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
index 8526a9d58f..4adf1f8c03 100644
--- a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
+++ b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
@@ -56,7 +56,7 @@
     is done through a SpriteGoal that follows the TouchPoint. The TouchPoints
     added to the MultiPointTouchArea are a component with the relevant logic
     embedded into it:
-    \snippet touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml 0
+    \snippet touchinteraction/multipointtouch/AugmentedTouchPoint.qml 0
 
     \section1 Flick Resize Example
 
diff --git a/examples/quick/touchinteraction/flickable/content/Panel.qml b/examples/quick/touchinteraction/flickable/Panel.qml
index 0aae0635b2..0aae0635b2 100644
--- a/examples/quick/touchinteraction/flickable/content/Panel.qml
+++ b/examples/quick/touchinteraction/flickable/Panel.qml
diff --git a/examples/quick/touchinteraction/flickable/content/cork.jpg b/examples/quick/touchinteraction/flickable/cork.jpg
index 160bc002bf..160bc002bf 100644
--- a/examples/quick/touchinteraction/flickable/content/cork.jpg
+++ b/examples/quick/touchinteraction/flickable/cork.jpg
diff --git a/examples/quick/touchinteraction/flickable/corkboards.qml b/examples/quick/touchinteraction/flickable/corkboards.qml
index 4825053f3f..2188219a64 100644
--- a/examples/quick/touchinteraction/flickable/corkboards.qml
+++ b/examples/quick/touchinteraction/flickable/corkboards.qml
@@ -49,7 +49,6 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "content"
 
 Rectangle {
     width: 320; height: 480
diff --git a/examples/quick/touchinteraction/flickable/content/note-yellow.png b/examples/quick/touchinteraction/flickable/note-yellow.png
index 3195952ad2..3195952ad2 100644
--- a/examples/quick/touchinteraction/flickable/content/note-yellow.png
+++ b/examples/quick/touchinteraction/flickable/note-yellow.png
diff --git a/examples/quick/touchinteraction/flickable/content/tack.png b/examples/quick/touchinteraction/flickable/tack.png
index cef2d1cd23..cef2d1cd23 100644
--- a/examples/quick/touchinteraction/flickable/content/tack.png
+++ b/examples/quick/touchinteraction/flickable/tack.png
diff --git a/examples/quick/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml b/examples/quick/touchinteraction/multipointtouch/AugmentedTouchPoint.qml
index 56f287666f..56f287666f 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml
+++ b/examples/quick/touchinteraction/multipointtouch/AugmentedTouchPoint.qml
diff --git a/examples/quick/touchinteraction/multipointtouch/content/Bear0.png b/examples/quick/touchinteraction/multipointtouch/Bear0.png
index f520cc1f1b..f520cc1f1b 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/Bear0.png
+++ b/examples/quick/touchinteraction/multipointtouch/Bear0.png
diff --git a/examples/quick/touchinteraction/multipointtouch/content/Bear1.png b/examples/quick/touchinteraction/multipointtouch/Bear1.png
index 3b88f3b32e..3b88f3b32e 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/Bear1.png
+++ b/examples/quick/touchinteraction/multipointtouch/Bear1.png
diff --git a/examples/quick/touchinteraction/multipointtouch/content/Bear2.png b/examples/quick/touchinteraction/multipointtouch/Bear2.png
index 337b636070..337b636070 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/Bear2.png
+++ b/examples/quick/touchinteraction/multipointtouch/Bear2.png
diff --git a/examples/quick/touchinteraction/multipointtouch/content/Bear3.png b/examples/quick/touchinteraction/multipointtouch/Bear3.png
index f0e68590f4..f0e68590f4 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/Bear3.png
+++ b/examples/quick/touchinteraction/multipointtouch/Bear3.png
diff --git a/examples/quick/touchinteraction/multipointtouch/content/BearB.png b/examples/quick/touchinteraction/multipointtouch/BearB.png
index 60be2b32c6..60be2b32c6 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/BearB.png
+++ b/examples/quick/touchinteraction/multipointtouch/BearB.png
diff --git a/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml b/examples/quick/touchinteraction/multipointtouch/BearWhackParticleSystem.qml
index 8da5949a1b..8da5949a1b 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml
+++ b/examples/quick/touchinteraction/multipointtouch/BearWhackParticleSystem.qml
diff --git a/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml b/examples/quick/touchinteraction/multipointtouch/ParticleFlame.qml
index 4c201720d9..4c201720d9 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml
+++ b/examples/quick/touchinteraction/multipointtouch/ParticleFlame.qml
diff --git a/examples/quick/touchinteraction/multipointtouch/bearwhack.qml b/examples/quick/touchinteraction/multipointtouch/bearwhack.qml
index 90c1a66891..5186d81e94 100644
--- a/examples/quick/touchinteraction/multipointtouch/bearwhack.qml
+++ b/examples/quick/touchinteraction/multipointtouch/bearwhack.qml
@@ -49,7 +49,6 @@
 ****************************************************************************/
 import QtQuick 2.0
 import QtQuick.Particles 2.0
-import "content"
 
 Item {
     id: root
@@ -60,7 +59,7 @@ Item {
         anchors.fill: parent
         z: 1000
         Image {
-            source: "content/title.png"
+            source: "title.png"
             anchors.centerIn: parent
         }
         MouseArea{
diff --git a/examples/quick/touchinteraction/multipointtouch/content/blur-circle.png b/examples/quick/touchinteraction/multipointtouch/blur-circle.png
index 1b03cd0b2c..1b03cd0b2c 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/blur-circle.png
+++ b/examples/quick/touchinteraction/multipointtouch/blur-circle.png
diff --git a/examples/quick/touchinteraction/multipointtouch/content/blur-circle3.png b/examples/quick/touchinteraction/multipointtouch/blur-circle3.png
index dbc39cb16e..dbc39cb16e 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/blur-circle3.png
+++ b/examples/quick/touchinteraction/multipointtouch/blur-circle3.png
diff --git a/examples/quick/touchinteraction/multipointtouch/content/heart-blur.png b/examples/quick/touchinteraction/multipointtouch/heart-blur.png
index dbc38804ee..dbc38804ee 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/heart-blur.png
+++ b/examples/quick/touchinteraction/multipointtouch/heart-blur.png
diff --git a/examples/quick/touchinteraction/multipointtouch/multiflame.qml b/examples/quick/touchinteraction/multipointtouch/multiflame.qml
index 514d583044..47fccd65f6 100644
--- a/examples/quick/touchinteraction/multipointtouch/multiflame.qml
+++ b/examples/quick/touchinteraction/multipointtouch/multiflame.qml
@@ -48,7 +48,6 @@
 **
 ****************************************************************************/
 import QtQuick 2.0
-import "content"
 
 Rectangle {
     width: 360
diff --git a/examples/quick/touchinteraction/multipointtouch/content/title.png b/examples/quick/touchinteraction/multipointtouch/title.png
index 01893a247d..01893a247d 100644
--- a/examples/quick/touchinteraction/multipointtouch/content/title.png
+++ b/examples/quick/touchinteraction/multipointtouch/title.png
diff --git a/examples/quick/touchinteraction/touchinteraction.qml b/examples/quick/touchinteraction/touchinteraction.qml
index a95867b6c1..3b9bfdaab5 100644
--- a/examples/quick/touchinteraction/touchinteraction.qml
+++ b/examples/quick/touchinteraction/touchinteraction.qml
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../shared"
+import shared
 
 Item {
     height: 480
diff --git a/examples/quick/touchinteraction/touchinteraction.qmlproject b/examples/quick/touchinteraction/touchinteraction.qmlproject
index a9aa9d2e81..50254f287f 100644
--- a/examples/quick/touchinteraction/touchinteraction.qmlproject
+++ b/examples/quick/touchinteraction/touchinteraction.qmlproject
@@ -2,6 +2,7 @@ import QmlProject 1.1
 
 Project {
     mainFile: "touchinteraction.qml"
+    importPaths: [ "../" ]
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
diff --git a/examples/quick/touchinteraction/touchinteraction.qrc b/examples/quick/touchinteraction/touchinteraction.qrc
index 6cec506a0f..cc5bcaceb0 100644
--- a/examples/quick/touchinteraction/touchinteraction.qrc
+++ b/examples/quick/touchinteraction/touchinteraction.qrc
@@ -3,24 +3,24 @@
         <file>touchinteraction.qml</file>
         <file>flickable/basic-flickable.qml</file>
         <file>flickable/corkboards.qml</file>
-        <file>flickable/content/cork.jpg</file>
-        <file>flickable/content/note-yellow.png</file>
-        <file>flickable/content/Panel.qml</file>
-        <file>flickable/content/tack.png</file>
+        <file>flickable/cork.jpg</file>
+        <file>flickable/note-yellow.png</file>
+        <file>flickable/Panel.qml</file>
+        <file>flickable/tack.png</file>
         <file>multipointtouch/bearwhack.qml</file>
         <file>multipointtouch/multiflame.qml</file>
-        <file>multipointtouch/content/AugmentedTouchPoint.qml</file>
-        <file>multipointtouch/content/Bear0.png</file>
-        <file>multipointtouch/content/Bear1.png</file>
-        <file>multipointtouch/content/Bear2.png</file>
-        <file>multipointtouch/content/Bear3.png</file>
-        <file>multipointtouch/content/BearB.png</file>
-        <file>multipointtouch/content/BearWhackParticleSystem.qml</file>
-        <file>multipointtouch/content/blur-circle.png</file>
-        <file>multipointtouch/content/blur-circle3.png</file>
-        <file>multipointtouch/content/heart-blur.png</file>
-        <file>multipointtouch/content/ParticleFlame.qml</file>
-        <file>multipointtouch/content/title.png</file>
+        <file>multipointtouch/AugmentedTouchPoint.qml</file>
+        <file>multipointtouch/Bear0.png</file>
+        <file>multipointtouch/Bear1.png</file>
+        <file>multipointtouch/Bear2.png</file>
+        <file>multipointtouch/Bear3.png</file>
+        <file>multipointtouch/BearB.png</file>
+        <file>multipointtouch/BearWhackParticleSystem.qml</file>
+        <file>multipointtouch/blur-circle.png</file>
+        <file>multipointtouch/blur-circle3.png</file>
+        <file>multipointtouch/heart-blur.png</file>
+        <file>multipointtouch/ParticleFlame.qml</file>
+        <file>multipointtouch/title.png</file>
         <file>pincharea/flickresize.qml</file>
         <file>pincharea/qt-logo.jpg</file>
     </qresource>