Fix samegame example to use QML modules

In this case it really makes no sense to use a shared directory because
we want to show the progressive changes between the different versions.
It's actually important to note that we're adding the pictures one by
one. Therefore, the shared directory is dissolved and the pictures added
duplicated into the respective versions of samegame.

Furthermore, moving the code into a "content" directory is a bad idea
because it complicates the import logic. We don't want to make the
"content" directory its own QML module. We might move samegame.qml into
the "content" directory, too, and apply some path wrangling to make it
work, but it's really not worth it here.

Change-Id: Ifc45f48832596377c21bc6ef55e918ef487bc94e
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit a3ea7a99381748c457336bfa8b9373070ebfa3ee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

47 files changed, 273 insertions, 60 deletions

diff --git a/examples/quick/tutorials/CMakeLists.txt b/examples/quick/tutorials/CMakeLists.txt
index 87d2caf01f..8777a16f50 100644
--- a/examples/quick/tutorials/CMakeLists.txt
+++ b/examples/quick/tutorials/CMakeLists.txt
@@ -1,2 +1 @@
-# Generated from tutorials.pro.
-
+add_subdirectory(samegame)
diff --git a/examples/quick/tutorials/samegame/CMakeLists.txt b/examples/quick/tutorials/samegame/CMakeLists.txt
new file mode 100644
index 0000000000..e0d5157a2c
--- /dev/null
+++ b/examples/quick/tutorials/samegame/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(samegame1)
+add_subdirectory(samegame2)
+add_subdirectory(samegame3)
+add_subdirectory(samegame4)
diff --git a/examples/quick/tutorials/samegame/samegame1/Block.qml b/examples/quick/tutorials/samegame/samegame1/Block.qml
index eac8e93810..157a3aa0c9 100644
--- a/examples/quick/tutorials/samegame/samegame1/Block.qml
+++ b/examples/quick/tutorials/samegame/samegame1/Block.qml
@@ -57,7 +57,7 @@ Item {
     Image {
         id: img
         anchors.fill: parent
-        source: "../shared/pics/redStone.png"
+        source: "pics/redStone.png"
     }
 }
 //![0]
diff --git a/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt
new file mode 100644
index 0000000000..ad791d77b5
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame1/CMakeLists.txt
@@ -0,0 +1,51 @@
+cmake_minimum_required(VERSION 3.16)
+project(samegame1 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame1")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 COMPONENTS Qml)
+
+qt_add_executable(samegame1
+    main.cpp
+)
+set_target_properties(samegame1 PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+
+qt_add_qml_module(samegame1
+    URI samegame
+    VERSION 1.0
+    QML_FILES
+        "Block.qml"
+        "Button.qml"
+        "samegame.qml"
+    RESOURCES
+        "pics/background.jpg"
+        "pics/redStone.png"
+)
+
+target_link_libraries(samegame1 PRIVATE
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
+install(TARGETS samegame1
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/quick/tutorials/samegame/samegame1/main.cpp b/examples/quick/tutorials/samegame/samegame1/main.cpp
index 7589b92906..f76b5d8940 100644
--- a/examples/quick/tutorials/samegame/samegame1/main.cpp
+++ b/examples/quick/tutorials/samegame/samegame1/main.cpp
@@ -48,4 +48,4 @@
 **
 ****************************************************************************/
 #include "../../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(samegame)
+DECLARATIVE_EXAMPLE_MAIN(samegame/samegame)
diff --git a/examples/quick/tutorials/samegame/shared/pics/background.jpg b/examples/quick/tutorials/samegame/samegame1/pics/background.jpg
index 903d395c8d..903d395c8d 100644
--- a/examples/quick/tutorials/samegame/shared/pics/background.jpg
+++ b/examples/quick/tutorials/samegame/samegame1/pics/background.jpg
diff --git a/examples/quick/tutorials/samegame/shared/pics/redStone.png b/examples/quick/tutorials/samegame/samegame1/pics/redStone.png
index 36b09a2686..36b09a2686 100644
--- a/examples/quick/tutorials/samegame/shared/pics/redStone.png
+++ b/examples/quick/tutorials/samegame/samegame1/pics/redStone.png
diff --git a/examples/quick/tutorials/samegame/samegame1/samegame.qml b/examples/quick/tutorials/samegame/samegame1/samegame.qml
index 68a1921da7..9eea87fc9c 100644
--- a/examples/quick/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/quick/tutorials/samegame/samegame1/samegame.qml
@@ -65,7 +65,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent
-            source: "../shared/pics/background.jpg"
+            source: "pics/background.jpg"
             fillMode: Image.PreserveAspectCrop
         }
     }
diff --git a/examples/quick/tutorials/samegame/samegame1/samegame1.pro b/examples/quick/tutorials/samegame/samegame1/samegame1.pro
index 9f316b6868..d523857d64 100644
--- a/examples/quick/tutorials/samegame/samegame1/samegame1.pro
+++ b/examples/quick/tutorials/samegame/samegame1/samegame1.pro
@@ -2,10 +2,7 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
-
-RESOURCES += \
-    samegame1.qrc \
-    ../shared/pics/shared.qrc
+RESOURCES += samegame1.qrc
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/samegame/samegame1
 INSTALLS += target
diff --git a/examples/quick/tutorials/samegame/samegame1/samegame1.qrc b/examples/quick/tutorials/samegame/samegame1/samegame1.qrc
index 866cf899bf..1f061d606f 100644
--- a/examples/quick/tutorials/samegame/samegame1/samegame1.qrc
+++ b/examples/quick/tutorials/samegame/samegame1/samegame1.qrc
@@ -1,7 +1,9 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/samegame">
         <file>Button.qml</file>
         <file>Block.qml</file>
         <file>samegame.qml</file>
+        <file>pics/background.jpg</file>
+        <file>pics/redStone.png</file>
     </qresource>
 </RCC>
diff --git a/examples/quick/tutorials/samegame/samegame2/Block.qml b/examples/quick/tutorials/samegame/samegame2/Block.qml
index 12cc0ea043..24672233b8 100644
--- a/examples/quick/tutorials/samegame/samegame2/Block.qml
+++ b/examples/quick/tutorials/samegame/samegame2/Block.qml
@@ -56,6 +56,6 @@ Item {
     Image {
         id: img
         anchors.fill: parent
-        source: "../shared/pics/redStone.png"
+        source: "pics/redStone.png"
     }
 }
diff --git a/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt
new file mode 100644
index 0000000000..5830622762
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame2/CMakeLists.txt
@@ -0,0 +1,52 @@
+cmake_minimum_required(VERSION 3.16)
+project(samegame2 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame2")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 COMPONENTS Qml)
+
+qt_add_executable(samegame2
+    main.cpp
+)
+set_target_properties(samegame2 PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+
+qt_add_qml_module(samegame2
+    URI samegame
+    VERSION 1.0
+    QML_FILES
+        "Block.qml"
+        "Button.qml"
+        "samegame.qml"
+        "samegame.js"
+    RESOURCES
+        "pics/background.jpg"
+        "pics/redStone.png"
+)
+
+target_link_libraries(samegame2 PRIVATE
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
+install(TARGETS samegame2
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/quick/tutorials/samegame/samegame2/main.cpp b/examples/quick/tutorials/samegame/samegame2/main.cpp
index 7589b92906..f76b5d8940 100644
--- a/examples/quick/tutorials/samegame/samegame2/main.cpp
+++ b/examples/quick/tutorials/samegame/samegame2/main.cpp
@@ -48,4 +48,4 @@
 **
 ****************************************************************************/
 #include "../../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(samegame)
+DECLARATIVE_EXAMPLE_MAIN(samegame/samegame)
diff --git a/examples/quick/tutorials/samegame/samegame2/pics/background.jpg b/examples/quick/tutorials/samegame/samegame2/pics/background.jpg
new file mode 100644
index 0000000000..903d395c8d
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame2/pics/background.jpg
diff --git a/examples/quick/tutorials/samegame/samegame2/pics/redStone.png b/examples/quick/tutorials/samegame/samegame2/pics/redStone.png
new file mode 100644
index 0000000000..36b09a2686
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame2/pics/redStone.png
diff --git a/examples/quick/tutorials/samegame/samegame2/samegame.qml b/examples/quick/tutorials/samegame/samegame2/samegame.qml
index 2c68fcf155..473b52f9ed 100644
--- a/examples/quick/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/quick/tutorials/samegame/samegame2/samegame.qml
@@ -67,7 +67,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent
-            source: "../shared/pics/background.jpg"
+            source: "pics/background.jpg"
             fillMode: Image.PreserveAspectCrop
         }
     }
diff --git a/examples/quick/tutorials/samegame/samegame2/samegame2.pro b/examples/quick/tutorials/samegame/samegame2/samegame2.pro
index 5ede9042cc..a0fc36e857 100644
--- a/examples/quick/tutorials/samegame/samegame2/samegame2.pro
+++ b/examples/quick/tutorials/samegame/samegame2/samegame2.pro
@@ -2,10 +2,7 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
-
-RESOURCES += \
-    samegame2.qrc \
-    ../shared/pics/shared.qrc
+RESOURCES += samegame2.qrc
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/samegame/samegame2
 INSTALLS += target
diff --git a/examples/quick/tutorials/samegame/samegame2/samegame2.qrc b/examples/quick/tutorials/samegame/samegame2/samegame2.qrc
index 0f95174d83..f632e88f6a 100644
--- a/examples/quick/tutorials/samegame/samegame2/samegame2.qrc
+++ b/examples/quick/tutorials/samegame/samegame2/samegame2.qrc
@@ -1,8 +1,10 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/samegame">
         <file>Button.qml</file>
         <file>Block.qml</file>
         <file>samegame.qml</file>
         <file>samegame.js</file>
+        <file>pics/background.jpg</file>
+        <file>pics/redStone.png</file>
     </qresource>
 </RCC>
diff --git a/examples/quick/tutorials/samegame/samegame3/Block.qml b/examples/quick/tutorials/samegame/samegame3/Block.qml
index d49bf89727..b543b06a7e 100644
--- a/examples/quick/tutorials/samegame/samegame3/Block.qml
+++ b/examples/quick/tutorials/samegame/samegame3/Block.qml
@@ -62,11 +62,11 @@ Item {
         anchors.fill: parent
         source: {
             if (type == 0)
-                return "../shared/pics/redStone.png";
+                return "pics/redStone.png";
             else if (type == 1)
-                return "../shared/pics/blueStone.png";
+                return "pics/blueStone.png";
             else
-                return "../shared/pics/greenStone.png";
+                return "pics/greenStone.png";
         }
     }
 }
diff --git a/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt
new file mode 100644
index 0000000000..0c3aa34b9d
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame3/CMakeLists.txt
@@ -0,0 +1,55 @@
+cmake_minimum_required(VERSION 3.16)
+project(samegame3 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame3")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 COMPONENTS Qml)
+
+qt_add_executable(samegame3
+    main.cpp
+)
+set_target_properties(samegame3 PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+
+qt_add_qml_module(samegame3
+    URI samegame
+    VERSION 1.0
+    QML_FILES
+        "Block.qml"
+        "Button.qml"
+        "Dialog.qml"
+        "samegame.qml"
+        "samegame.js"
+    RESOURCES
+        "pics/background.jpg"
+        "pics/blueStone.png"
+        "pics/greenStone.png"
+        "pics/redStone.png"
+)
+
+target_link_libraries(samegame3 PRIVATE
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
+install(TARGETS samegame3
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/quick/tutorials/samegame/samegame3/main.cpp b/examples/quick/tutorials/samegame/samegame3/main.cpp
index 7589b92906..f76b5d8940 100644
--- a/examples/quick/tutorials/samegame/samegame3/main.cpp
+++ b/examples/quick/tutorials/samegame/samegame3/main.cpp
@@ -48,4 +48,4 @@
 **
 ****************************************************************************/
 #include "../../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(samegame)
+DECLARATIVE_EXAMPLE_MAIN(samegame/samegame)
diff --git a/examples/quick/tutorials/samegame/samegame3/pics/background.jpg b/examples/quick/tutorials/samegame/samegame3/pics/background.jpg
new file mode 100644
index 0000000000..903d395c8d
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame3/pics/background.jpg
diff --git a/examples/quick/tutorials/samegame/shared/pics/blueStone.png b/examples/quick/tutorials/samegame/samegame3/pics/blueStone.png
index 20e43c75b6..20e43c75b6 100644
--- a/examples/quick/tutorials/samegame/shared/pics/blueStone.png
+++ b/examples/quick/tutorials/samegame/samegame3/pics/blueStone.png
diff --git a/examples/quick/tutorials/samegame/shared/pics/greenStone.png b/examples/quick/tutorials/samegame/samegame3/pics/greenStone.png
index b568a1900c..b568a1900c 100644
--- a/examples/quick/tutorials/samegame/shared/pics/greenStone.png
+++ b/examples/quick/tutorials/samegame/samegame3/pics/greenStone.png
diff --git a/examples/quick/tutorials/samegame/samegame3/pics/redStone.png b/examples/quick/tutorials/samegame/samegame3/pics/redStone.png
new file mode 100644
index 0000000000..36b09a2686
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame3/pics/redStone.png
diff --git a/examples/quick/tutorials/samegame/samegame3/samegame.qml b/examples/quick/tutorials/samegame/samegame3/samegame.qml
index 11376232a2..a83cb01b7b 100644
--- a/examples/quick/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/quick/tutorials/samegame/samegame3/samegame.qml
@@ -66,7 +66,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent
-            source: "../shared/pics/background.jpg"
+            source: "pics/background.jpg"
             fillMode: Image.PreserveAspectCrop
         }
 
diff --git a/examples/quick/tutorials/samegame/samegame3/samegame3.pro b/examples/quick/tutorials/samegame/samegame3/samegame3.pro
index 7b99673e57..88f8f87699 100644
--- a/examples/quick/tutorials/samegame/samegame3/samegame3.pro
+++ b/examples/quick/tutorials/samegame/samegame3/samegame3.pro
@@ -2,10 +2,7 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
-
-RESOURCES += \
-    samegame3.qrc \
-    ../shared/pics/shared.qrc
+RESOURCES += samegame3.qrc
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/samegame/samegame3
 INSTALLS += target
diff --git a/examples/quick/tutorials/samegame/samegame3/samegame3.qrc b/examples/quick/tutorials/samegame/samegame3/samegame3.qrc
index 0f95174d83..16c90b4516 100644
--- a/examples/quick/tutorials/samegame/samegame3/samegame3.qrc
+++ b/examples/quick/tutorials/samegame/samegame3/samegame3.qrc
@@ -1,8 +1,13 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/samegame">
         <file>Button.qml</file>
         <file>Block.qml</file>
+        <file>Dialog.qml</file>
         <file>samegame.qml</file>
         <file>samegame.js</file>
+        <file>pics/background.jpg</file>
+        <file>pics/blueStone.png</file>
+        <file>pics/greenStone.png</file>
+        <file>pics/redStone.png</file>
     </qresource>
 </RCC>
diff --git a/examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/quick/tutorials/samegame/samegame4/BoomBlock.qml
index 12cc64a09b..8353437542 100644
--- a/examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
+++ b/examples/quick/tutorials/samegame/samegame4/BoomBlock.qml
@@ -76,11 +76,11 @@ Item {
         anchors.fill: parent
         source: {
             if (block.type == 0)
-                return "../../shared/pics/redStone.png";
+                return "pics/redStone.png";
             else if (block.type == 1)
-                return "../../shared/pics/blueStone.png";
+                return "pics/blueStone.png";
             else
-                return "../../shared/pics/greenStone.png";
+                return "pics/greenStone.png";
         }
         opacity: 0
 
@@ -98,11 +98,11 @@ Item {
             // ![0]
             source: {
                 if (block.type == 0)
-                    return "../../shared/pics/redStar.png";
+                    return "pics/redStar.png";
                 else if (block.type == 1)
-                    return "../../shared/pics/blueStar.png";
+                    return "pics/blueStar.png";
                 else
-                    return "../../shared/pics/greenStar.png";
+                    return "pics/greenStar.png";
             }
             rotationVelocityVariation: 360
             // ![0]
diff --git a/examples/quick/tutorials/samegame/samegame4/content/Button.qml b/examples/quick/tutorials/samegame/samegame4/Button.qml
index 77921772d2..77921772d2 100644
--- a/examples/quick/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/quick/tutorials/samegame/samegame4/Button.qml
diff --git a/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt
new file mode 100644
index 0000000000..c89d191873
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame4/CMakeLists.txt
@@ -0,0 +1,62 @@
+cmake_minimum_required(VERSION 3.16)
+project(samegame4 LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tutorials/samegame/samegame4")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Quick)
+find_package(Qt6 COMPONENTS Qml)
+
+qt_add_executable(samegame4
+    main.cpp
+)
+set_target_properties(samegame4 PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
+
+qt_add_qml_module(samegame4
+    URI samegame
+    VERSION 1.0
+    QML_FILES
+        "BoomBlock.qml"
+        "Button.qml"
+        "Dialog.qml"
+        "samegame.qml"
+        "samegame.js"
+    RESOURCES
+        "highscores/README"
+        "highscores/score_data.xml"
+        "highscores/score_style.xsl"
+        "highscores/scores.php"
+        "pics/background.jpg"
+        "pics/blueStar.png"
+        "pics/blueStone.png"
+        "pics/greenStar.png"
+        "pics/greenStone.png"
+        "pics/redStar.png"
+        "pics/redStone.png"
+)
+
+target_link_libraries(samegame4 PRIVATE
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
+install(TARGETS samegame4
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/quick/tutorials/samegame/samegame4/content/Dialog.qml b/examples/quick/tutorials/samegame/samegame4/Dialog.qml
index 5663add8ad..5663add8ad 100644
--- a/examples/quick/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/quick/tutorials/samegame/samegame4/Dialog.qml
diff --git a/examples/quick/tutorials/samegame/samegame4/main.cpp b/examples/quick/tutorials/samegame/samegame4/main.cpp
index 7589b92906..f76b5d8940 100644
--- a/examples/quick/tutorials/samegame/samegame4/main.cpp
+++ b/examples/quick/tutorials/samegame/samegame4/main.cpp
@@ -48,4 +48,4 @@
 **
 ****************************************************************************/
 #include "../../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(samegame)
+DECLARATIVE_EXAMPLE_MAIN(samegame/samegame)
diff --git a/examples/quick/tutorials/samegame/samegame4/pics/background.jpg b/examples/quick/tutorials/samegame/samegame4/pics/background.jpg
new file mode 100644
index 0000000000..903d395c8d
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame4/pics/background.jpg
diff --git a/examples/quick/tutorials/samegame/shared/pics/blueStar.png b/examples/quick/tutorials/samegame/samegame4/pics/blueStar.png
index 213bb4bf6c..213bb4bf6c 100644
--- a/examples/quick/tutorials/samegame/shared/pics/blueStar.png
+++ b/examples/quick/tutorials/samegame/samegame4/pics/blueStar.png
diff --git a/examples/quick/tutorials/samegame/samegame4/pics/blueStone.png b/examples/quick/tutorials/samegame/samegame4/pics/blueStone.png
new file mode 100644
index 0000000000..20e43c75b6
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame4/pics/blueStone.png
diff --git a/examples/quick/tutorials/samegame/shared/pics/greenStar.png b/examples/quick/tutorials/samegame/samegame4/pics/greenStar.png
index 38429749b8..38429749b8 100644
--- a/examples/quick/tutorials/samegame/shared/pics/greenStar.png
+++ b/examples/quick/tutorials/samegame/samegame4/pics/greenStar.png
diff --git a/examples/quick/tutorials/samegame/samegame4/pics/greenStone.png b/examples/quick/tutorials/samegame/samegame4/pics/greenStone.png
new file mode 100644
index 0000000000..b568a1900c
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame4/pics/greenStone.png
diff --git a/examples/quick/tutorials/samegame/shared/pics/redStar.png b/examples/quick/tutorials/samegame/samegame4/pics/redStar.png
index 5cdf45c4c0..5cdf45c4c0 100644
--- a/examples/quick/tutorials/samegame/shared/pics/redStar.png
+++ b/examples/quick/tutorials/samegame/samegame4/pics/redStar.png
diff --git a/examples/quick/tutorials/samegame/samegame4/pics/redStone.png b/examples/quick/tutorials/samegame/samegame4/pics/redStone.png
new file mode 100644
index 0000000000..36b09a2686
--- /dev/null
+++ b/examples/quick/tutorials/samegame/samegame4/pics/redStone.png
diff --git a/examples/quick/tutorials/samegame/samegame4/content/samegame.js b/examples/quick/tutorials/samegame/samegame4/samegame.js
index 80b175d450..80b175d450 100644
--- a/examples/quick/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/quick/tutorials/samegame/samegame4/samegame.js
diff --git a/examples/quick/tutorials/samegame/samegame4/samegame.qml b/examples/quick/tutorials/samegame/samegame4/samegame.qml
index 0cdbcd8cb0..1335024b13 100644
--- a/examples/quick/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/quick/tutorials/samegame/samegame4/samegame.qml
@@ -49,8 +49,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "content"
-import "content/samegame.js" as SameGame
+import "samegame.js" as SameGame
 
 Rectangle {
     id: screen
@@ -66,7 +65,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent
-            source: "../shared/pics/background.jpg"
+            source: "pics/background.jpg"
             fillMode: Image.PreserveAspectCrop
         }
 
diff --git a/examples/quick/tutorials/samegame/samegame4/samegame4.pro b/examples/quick/tutorials/samegame/samegame4/samegame4.pro
index 5da0d46e19..e9d341d555 100644
--- a/examples/quick/tutorials/samegame/samegame4/samegame4.pro
+++ b/examples/quick/tutorials/samegame/samegame4/samegame4.pro
@@ -2,10 +2,7 @@ TEMPLATE = app
 
 QT += quick qml
 SOURCES += main.cpp
-
-RESOURCES += \
-    samegame4.qrc \
-    ../shared/pics/shared.qrc
+RESOURCES += samegame4.qrc
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/samegame/samegame4
 INSTALLS += target
diff --git a/examples/quick/tutorials/samegame/samegame4/samegame4.qrc b/examples/quick/tutorials/samegame/samegame4/samegame4.qrc
index 8b130721f5..9dc482d7de 100644
--- a/examples/quick/tutorials/samegame/samegame4/samegame4.qrc
+++ b/examples/quick/tutorials/samegame/samegame4/samegame4.qrc
@@ -1,13 +1,20 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/samegame">
         <file>samegame.qml</file>
-        <file>content/BoomBlock.qml</file>
-        <file>content/Button.qml</file>
-        <file>content/Dialog.qml</file>
-        <file>content/samegame.js</file>
+        <file>BoomBlock.qml</file>
+        <file>Button.qml</file>
+        <file>Dialog.qml</file>
+        <file>samegame.js</file>
         <file>highscores/README</file>
         <file>highscores/score_data.xml</file>
         <file>highscores/score_style.xsl</file>
         <file>highscores/scores.php</file>
+        <file>pics/background.jpg</file>
+        <file>pics/blueStar.png</file>
+        <file>pics/blueStone.png</file>
+        <file>pics/greenStar.png</file>
+        <file>pics/greenStone.png</file>
+        <file>pics/redStar.png</file>
+        <file>pics/redStone.png</file>
     </qresource>
 </RCC>
diff --git a/examples/quick/tutorials/samegame/shared/pics/shared.qrc b/examples/quick/tutorials/samegame/shared/pics/shared.qrc
deleted file mode 100644
index 8982a9face..0000000000
--- a/examples/quick/tutorials/samegame/shared/pics/shared.qrc
+++ /dev/null
@@ -1,13 +0,0 @@
-<RCC>
-    <qresource prefix="/shared/pics">
-        <file>background.jpg</file>
-        <file>blueStar.png</file>
-        <file>blueStone.png</file>
-        <file>greenStar.png</file>
-        <file>greenStone.png</file>
-        <file>redStar.png</file>
-        <file>redStone.png</file>
-        <file>star.png</file>
-        <file>yellowStone.png</file>
-    </qresource>
-</RCC>
diff --git a/examples/quick/tutorials/samegame/shared/pics/star.png b/examples/quick/tutorials/samegame/shared/pics/star.png
deleted file mode 100644
index defbde53ca..0000000000
--- a/examples/quick/tutorials/samegame/shared/pics/star.png
+++ /dev/null
diff --git a/examples/quick/tutorials/samegame/shared/pics/yellowStone.png b/examples/quick/tutorials/samegame/shared/pics/yellowStone.png
deleted file mode 100644
index b1ce76212c..0000000000
--- a/examples/quick/tutorials/samegame/shared/pics/yellowStone.png
+++ /dev/null