1 files changed, 41 insertions, 102 deletions
diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt
index c082bea86d..9434063429 100644
--- a/examples/quick/particles/affectors/CMakeLists.txt
+++ b/examples/quick/particles/affectors/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from affectors.pro.
-
 cmake_minimum_required(VERSION 3.16)
 project(affectors LANGUAGES CXX)
 
@@ -7,7 +5,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
   set(INSTALL_EXAMPLESDIR "examples")
@@ -15,119 +12,61 @@ endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/particles/affectors")
 
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS Qml)
+find_package(Qt6 COMPONENTS Core Gui Quick Qml)
+
+add_subdirectory("../../shared" "shared")
 
-qt_add_executable(affectors
+qt_add_executable(affectorsexample WIN32 MACOSX_BUNDLE
     main.cpp
 )
-set_target_properties(affectors PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-target_link_libraries(affectors PUBLIC
+target_link_libraries(affectorsexample PRIVATE
     Qt::Core
     Qt::Gui
     Qt::Qml
     Qt::Quick
 )
 
+add_dependencies(affectorsexample affectors_shared)
 
 # Resources:
-set(affectors_resource_files
-    "affectors.qml"
-    "content/GreyButton.qml"
-    "content/age.qml"
-    "content/attractor.qml"
-    "content/customaffector.qml"
-    "content/friction.qml"
-    "content/gravity.qml"
-    "content/groupgoal.qml"
-    "content/move.qml"
-    "content/spritegoal.qml"
-    "content/turbulence.qml"
-    "content/wander.qml"
-)
-
-qt6_add_resources(affectors "affectors"
-    PREFIX
-        "/particles/affectors"
-    FILES
-        ${affectors_resource_files}
-)
-set(images_resource_files
-    "../images/_explo.png"
-    "../images/backgroundLeaves.jpg"
-    "../images/bear_tiles.png"
-    "../images/candle.png"
-    "../images/colortable.png"
-    "../images/finalfrontier.png"
-    "../images/flower.png"
-    "../images/matchmask.png"
-    "../images/meteor.png"
-    "../images/meteor_explo.png"
-    "../images/meteors.png"
-    "../images/nullRock.png"
-    "../images/particle2.png"
-    "../images/particle3.png"
-    "../images/particleA.png"
-    "../images/portal_bg.png"
-    "../images/realLeaf1.png"
-    "../images/realLeaf2.png"
-    "../images/realLeaf3.png"
-    "../images/realLeaf4.png"
-    "../images/rocket.png"
-    "../images/rocket2.png"
-    "../images/sizeInOut.png"
-    "../images/snowflake.png"
-    "../images/sparkleSize.png"
-    "../images/starfish_0.png"
-    "../images/starfish_1.png"
-    "../images/starfish_2.png"
-    "../images/starfish_3.png"
-    "../images/starfish_4.png"
-    "../images/starfish_mask.png"
+qt_add_qml_module(affectorsexample
+    URI affectors
+    VERSION 1.0
+    QML_FILES
+        "affectors.qml"
+        "GreyButton.qml"
+        "age.qml"
+        "attractor.qml"
+        "customaffector.qml"
+        "friction.qml"
+        "gravity.qml"
+        "groupgoal.qml"
+        "move.qml"
+        "spritegoal.qml"
+        "turbulence.qml"
+        "wander.qml"
+    RESOURCES
+        "images/snowflake.png"
+        "images/finalfrontier.png"
+        "images/meteor.png"
+        "images/rocket.png"
+        "images/rocket2.png"
+        "images/backgroundLeaves.jpg"
+        "images/realLeaf1.png"
+        "images/realLeaf2.png"
+        "images/realLeaf3.png"
+        "images/realLeaf4.png"
+        "images/particleA.png"
+        "images/matchmask.png"
+        "images/nullRock.png"
+        "images/_explo.png"
+        "images/candle.png"
 )
 
-qt6_add_resources(affectors "images"
-    PREFIX
-        "/particles"
-    BASE
-        ".."
-    FILES
-        ${images_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(affectors "shared"
-    PREFIX
-        "/shared"
-    BASE
-        "../../shared"
-    FILES
-        ${shared_resource_files}
-)
-
-install(TARGETS affectors
+install(TARGETS affectorsexample
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
+
+bundle_shared(affectorsexample)