1 files changed, 41 insertions, 73 deletions
diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt
index 4a89d76210..425e8933bd 100644
--- a/examples/quick/imageelements/CMakeLists.txt
+++ b/examples/quick/imageelements/CMakeLists.txt
@@ -7,7 +7,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,89 +14,58 @@ endif()
 
 set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/imageelements")
 
-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)
 
-qt_add_executable(imageelements
+add_subdirectory("../shared" "shared")
+
+qt_add_executable(imageelementsexample
+    WIN32
+    MACOSX_BUNDLE
     main.cpp
 )
-set_target_properties(imageelements PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-target_link_libraries(imageelements PUBLIC
+
+target_link_libraries(imageelementsexample PUBLIC
     Qt::Core
     Qt::Gui
     Qt::Qml
     Qt::Quick
 )
 
+qt_add_qml_module(imageelementsexample
+    URI imageelements
+    VERSION 1.0
+    QML_FILES
+        "animatedimage.qml"
+        "animatedsprite.qml"
+        "borderimage.qml"
+        "framestepping.qml"
+        "image.qml"
+        "imageelements.qml"
+        "multiframeborderimage.qml"
+        "shadows.qml"
+        "spritesequence.qml"
+        "BorderImageSelector.qml"
+        "ImageCell.qml"
+        "MyBorderImage.qml"
+        "ShadowRectangle.qml"
+    RESOURCES
+        "pics/qt-logo.png"
+        "pics/shadow.png"
+        "pics/speaker.png"
+        "pics/colors.png"
+        "pics/BearSheet.png"
+        "pics/Uniflow_steam_engine.gif"
+        "pics/arrow.png"
+        "pics/bw.png"
+        "pics/multi.ico"
+        "pics/colors-round.sci"
+        "pics/colors-stretch.sci"
+    )
 
-# Resources:
-set(imageelements_resource_files
-    "animatedimage.qml"
-    "animatedsprite.qml"
-    "borderimage.qml"
-    "content/BearSheet.png"
-    "content/BorderImageSelector.qml"
-    "content/ImageCell.qml"
-    "content/MyBorderImage.qml"
-    "content/ShadowRectangle.qml"
-    "content/Uniflow_steam_engine.gif"
-    "content/arrow.png"
-    "content/bw.png"
-    "content/colors-round.sci"
-    "content/colors-stretch.sci"
-    "content/colors.png"
-    "content/multi.ico"
-    "content/qt-logo.png"
-    "content/shadow.png"
-    "content/speaker.png"
-    "framestepping.qml"
-    "image.qml"
-    "imageelements.qml"
-    "multiframeborderimage.qml"
-    "shadows.qml"
-    "spritesequence.qml"
-)
-
-qt6_add_resources(imageelements "imageelements"
-    PREFIX
-        "/imageelements"
-    FILES
-        ${imageelements_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(imageelements "shared"
-    PREFIX
-        "/shared"
-    BASE
-        "../shared"
-    FILES
-        ${shared_resource_files}
-)
-
-install(TARGETS imageelements
+install(TARGETS imageelementsexample
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
+
+bundle_shared(imageelementsexample)