Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"

24 files changed, 390 insertions, 32 deletions

diff --git a/examples/widgets/itemviews/addressbook/CMakeLists.txt b/examples/widgets/itemviews/addressbook/CMakeLists.txt
index eeb4ad23d7..5c14da9ac5 100644
--- a/examples/widgets/itemviews/addressbook/CMakeLists.txt
+++ b/examples/widgets/itemviews/addressbook/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/addressbook")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(addressbook
@@ -22,6 +24,8 @@ add_qt_gui_executable(addressbook
     tablemodel.cpp tablemodel.h
 )
 target_link_libraries(addressbook PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt
index ee084edab6..90862ac0b0 100644
--- a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/basicsortfiltermodel")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(basicsortfiltermodel
@@ -18,6 +20,8 @@ add_qt_gui_executable(basicsortfiltermodel
     window.cpp window.h
 )
 target_link_libraries(basicsortfiltermodel PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/examples/widgets/itemviews/chart/CMakeLists.txt
index 89cac1f515..5788215de6 100644
--- a/examples/widgets/itemviews/chart/CMakeLists.txt
+++ b/examples/widgets/itemviews/chart/CMakeLists.txt
@@ -9,20 +9,42 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/chart")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(chart
-    chart.qrc
     main.cpp
     mainwindow.cpp mainwindow.h
     pieview.cpp pieview.h
 )
 target_link_libraries(chart PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(chart_resource_files
+    "qtdata.cht"
+)
+
+qt6_add_resources(chart "chart"
+    PREFIX
+        "/Charts"
+    FILES
+        ${chart_resource_files}
+)
+
+if(UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS)
+    target_link_libraries(chart PUBLIC
+        m
+    )
+endif()
+
 install(TARGETS chart
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt
index b665171ddb..3ec96a2fc4 100644
--- a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt
+++ b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/coloreditorfactory")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(coloreditorfactory
@@ -19,6 +21,8 @@ add_qt_gui_executable(coloreditorfactory
     window.cpp window.h
 )
 target_link_libraries(coloreditorfactory PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt
index af806ceb64..c8a0bc1438 100644
--- a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt
+++ b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/combowidgetmapper")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(combowidgetmapper
@@ -18,6 +20,8 @@ add_qt_gui_executable(combowidgetmapper
     window.cpp window.h
 )
 target_link_libraries(combowidgetmapper PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
index c5110ba8b3..859b88a397 100644
--- a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
@@ -9,21 +9,37 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/customsortfiltermodel")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(customsortfiltermodel
-    customsortfiltermodel.qrc
     filterwidget.cpp filterwidget.h
     main.cpp
     mysortfilterproxymodel.cpp mysortfilterproxymodel.h
     window.cpp window.h
 )
 target_link_libraries(customsortfiltermodel PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(customsortfiltermodel_resource_files
+    "images/find.png"
+)
+
+qt6_add_resources(customsortfiltermodel "customsortfiltermodel"
+    PREFIX
+        "/"
+    FILES
+        ${customsortfiltermodel_resource_files}
+)
+
 install(TARGETS customsortfiltermodel
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/itemviews/dirview/CMakeLists.txt b/examples/widgets/itemviews/dirview/CMakeLists.txt
index 3875436371..6cb902c092 100644
--- a/examples/widgets/itemviews/dirview/CMakeLists.txt
+++ b/examples/widgets/itemviews/dirview/CMakeLists.txt
@@ -9,14 +9,18 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/dirview")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(dirview
     main.cpp
 )
 target_link_libraries(dirview PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
index c9f46d9e6a..faae8e1a80 100644
--- a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
@@ -9,21 +9,37 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/editabletreemodel")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(editabletreemodel
-    editabletreemodel.qrc
     main.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
     treeitem.cpp treeitem.h
     treemodel.cpp treemodel.h
 )
 target_link_libraries(editabletreemodel PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(editabletreemodel_resource_files
+    "default.txt"
+)
+
+qt6_add_resources(editabletreemodel "editabletreemodel"
+    PREFIX
+        "/"
+    FILES
+        ${editabletreemodel_resource_files}
+)
+
 install(TARGETS editabletreemodel
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/itemviews/fetchmore/CMakeLists.txt b/examples/widgets/itemviews/fetchmore/CMakeLists.txt
index dded651b57..fea985d049 100644
--- a/examples/widgets/itemviews/fetchmore/CMakeLists.txt
+++ b/examples/widgets/itemviews/fetchmore/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/fetchmore")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(fetchmore
@@ -19,6 +21,8 @@ add_qt_gui_executable(fetchmore
     window.cpp window.h
 )
 target_link_libraries(fetchmore PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/flattreeview/CMakeLists.txt b/examples/widgets/itemviews/flattreeview/CMakeLists.txt
index 5f9cd9d77c..c0c4ef6146 100644
--- a/examples/widgets/itemviews/flattreeview/CMakeLists.txt
+++ b/examples/widgets/itemviews/flattreeview/CMakeLists.txt
@@ -9,14 +9,18 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/flattreeview")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(flattreeview
     main.cpp
 )
 target_link_libraries(flattreeview PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt
index 8e2db43944..dab2e0a153 100644
--- a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt
+++ b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt
@@ -9,19 +9,35 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/frozencolumn")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(frozencolumn
     freezetablewidget.cpp freezetablewidget.h
-    grades.qrc
     main.cpp
 )
 target_link_libraries(frozencolumn PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(grades_resource_files
+    "grades.txt"
+)
+
+qt6_add_resources(frozencolumn "grades"
+    PREFIX
+        "/"
+    FILES
+        ${grades_resource_files}
+)
+
 install(TARGETS frozencolumn
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/itemviews/interview/CMakeLists.txt b/examples/widgets/itemviews/interview/CMakeLists.txt
index d37ee8fe18..c27018ffa4 100644
--- a/examples/widgets/itemviews/interview/CMakeLists.txt
+++ b/examples/widgets/itemviews/interview/CMakeLists.txt
@@ -9,19 +9,37 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/interview")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(interview
-    interview.qrc
     main.cpp
     model.cpp model.h
 )
 target_link_libraries(interview PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(interview_resource_files
+    "images/folder.png"
+    "images/interview.png"
+    "images/services.png"
+)
+
+qt6_add_resources(interview "interview"
+    PREFIX
+        "/"
+    FILES
+        ${interview_resource_files}
+)
+
 install(TARGETS interview
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/itemviews/pixelator/.prev_CMakeLists.txt b/examples/widgets/itemviews/pixelator/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1c8ccc6f81
--- /dev/null
+++ b/examples/widgets/itemviews/pixelator/.prev_CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from pixelator.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(pixelator LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/pixelator")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(pixelator
+    imagemodel.cpp imagemodel.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    pixeldelegate.cpp pixeldelegate.h
+)
+target_link_libraries(pixelator PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(images_resource_files
+    "images/qt.png"
+)
+
+qt6_add_resources(pixelator "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(pixelator PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS pixelator
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt
index dbb888a1b2..aba494c31a 100644
--- a/examples/widgets/itemviews/pixelator/CMakeLists.txt
+++ b/examples/widgets/itemviews/pixelator/CMakeLists.txt
@@ -9,22 +9,39 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/pixelator")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS PrintSupport) # special case
 
 add_qt_gui_executable(pixelator
     imagemodel.cpp imagemodel.h
-    images.qrc
     main.cpp
     mainwindow.cpp mainwindow.h
     pixeldelegate.cpp pixeldelegate.h
 )
 target_link_libraries(pixelator PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
-if (TARGET Qt::PrintSupport)
+
+
+# Resources:
+set(images_resource_files
+    "images/qt.png"
+)
+
+qt6_add_resources(pixelator "images"
+    PREFIX
+        "/"
+    FILES
+        ${images_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
     target_link_libraries(pixelator PUBLIC
         Qt::PrintSupport
     )
diff --git a/examples/widgets/itemviews/puzzle/.prev_CMakeLists.txt b/examples/widgets/itemviews/puzzle/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..17765e9d47
--- /dev/null
+++ b/examples/widgets/itemviews/puzzle/.prev_CMakeLists.txt
@@ -0,0 +1,47 @@
+# Generated from puzzle.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(puzzle LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/puzzle")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(puzzle
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    piecesmodel.cpp piecesmodel.h
+    puzzlewidget.cpp puzzlewidget.h
+)
+target_link_libraries(puzzle PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(puzzle_resource_files
+    "example.jpg"
+)
+
+qt6_add_resources(puzzle "puzzle"
+    PREFIX
+        "/images"
+    FILES
+        ${puzzle_resource_files}
+)
+
+install(TARGETS puzzle
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/examples/widgets/itemviews/puzzle/CMakeLists.txt
index ed0b4f3f7c..53494d37f1 100644
--- a/examples/widgets/itemviews/puzzle/CMakeLists.txt
+++ b/examples/widgets/itemviews/puzzle/CMakeLists.txt
@@ -9,21 +9,37 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/puzzle")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(itemviews_puzzle # special case: renamed puzzle
     main.cpp
     mainwindow.cpp mainwindow.h
     piecesmodel.cpp piecesmodel.h
-    puzzle.qrc
     puzzlewidget.cpp puzzlewidget.h
 )
-target_link_libraries(itemviews_puzzle PUBLIC # special case: renamed puzzle
+target_link_libraries(itemviews_puzzle PUBLIC # special case
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(puzzle_resource_files
+    "example.jpg"
+)
+
+qt6_add_resources(itemviews_puzzle "puzzle"
+    PREFIX
+        "/images"
+    FILES
+        ${puzzle_resource_files}
+)
+
 install(TARGETS itemviews_puzzle # special case: renamed puzzle
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt
index 610b7e2ff2..e22e3fe1ad 100644
--- a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/simpledommodel")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Xml)
 find_package(Qt6 COMPONENTS Widgets)
 
@@ -21,6 +23,8 @@ add_qt_gui_executable(simpledommodel
     mainwindow.cpp mainwindow.h
 )
 target_link_libraries(simpledommodel PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
     Qt::Xml
 )
diff --git a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
index 7a1cafc26e..8a6607e584 100644
--- a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
@@ -9,20 +9,36 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/simpletreemodel")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(simpletreemodel
     main.cpp
-    simpletreemodel.qrc
     treeitem.cpp treeitem.h
     treemodel.cpp treemodel.h
 )
 target_link_libraries(simpletreemodel PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(simpletreemodel_resource_files
+    "default.txt"
+)
+
+qt6_add_resources(simpletreemodel "simpletreemodel"
+    PREFIX
+        "/"
+    FILES
+        ${simpletreemodel_resource_files}
+)
+
 install(TARGETS simpletreemodel
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt
index 367f24235b..163dc98e2c 100644
--- a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt
+++ b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/simplewidgetmapper")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(simplewidgetmapper
@@ -18,6 +20,8 @@ add_qt_gui_executable(simplewidgetmapper
     window.cpp window.h
 )
 target_link_libraries(simplewidgetmapper PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt
index 0c08a1bbba..b73158cd5a 100644
--- a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt
+++ b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/spinboxdelegate")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(spinboxdelegate
@@ -18,6 +20,8 @@ add_qt_gui_executable(spinboxdelegate
     main.cpp
 )
 target_link_libraries(spinboxdelegate PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/spreadsheet/.prev_CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..acf5f187fe
--- /dev/null
+++ b/examples/widgets/itemviews/spreadsheet/.prev_CMakeLists.txt
@@ -0,0 +1,54 @@
+# Generated from spreadsheet.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(spreadsheet LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/spreadsheet")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(spreadsheet
+    main.cpp
+    printview.cpp printview.h
+    spreadsheet.cpp spreadsheet.h
+    spreadsheetdelegate.cpp spreadsheetdelegate.h
+    spreadsheetitem.cpp spreadsheetitem.h
+)
+target_link_libraries(spreadsheet PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
+)
+
+
+# Resources:
+set(spreadsheet_resource_files
+    "images/interview.png"
+)
+
+qt6_add_resources(spreadsheet "spreadsheet"
+    PREFIX
+        "/"
+    FILES
+        ${spreadsheet_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(spreadsheet PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
+install(TARGETS spreadsheet
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
index 7916d07a4d..b1fc6ff01a 100644
--- a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
+++ b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
@@ -9,19 +9,23 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/spreadsheet")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS PrintSupport) # special case
 
 add_qt_gui_executable(spreadsheet
     main.cpp
     printview.cpp printview.h
-    spreadsheet.cpp spreadsheet.h spreadsheet.qrc
+    spreadsheet.cpp spreadsheet.h
     spreadsheetdelegate.cpp spreadsheetdelegate.h
     spreadsheetitem.cpp spreadsheetitem.h
 )
 target_link_libraries(spreadsheet PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 # special case begin
@@ -30,6 +34,25 @@ if (TARGET Qt::PrintSupport)
 endif()
 # special case end
 
+
+# Resources:
+set(spreadsheet_resource_files
+    "images/interview.png"
+)
+
+qt6_add_resources(spreadsheet "spreadsheet"
+    PREFIX
+        "/"
+    FILES
+        ${spreadsheet_resource_files}
+)
+
+if(TARGET Qt::PrintSupport)
+    target_link_libraries(spreadsheet PUBLIC
+        Qt::PrintSupport
+    )
+endif()
+
 install(TARGETS spreadsheet
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/itemviews/stardelegate/CMakeLists.txt b/examples/widgets/itemviews/stardelegate/CMakeLists.txt
index da3a4a07b4..5f6f660488 100644
--- a/examples/widgets/itemviews/stardelegate/CMakeLists.txt
+++ b/examples/widgets/itemviews/stardelegate/CMakeLists.txt
@@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/stardelegate")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(stardelegate
@@ -20,6 +22,8 @@ add_qt_gui_executable(stardelegate
     starrating.cpp starrating.h
 )
 target_link_libraries(stardelegate PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/itemviews/storageview/CMakeLists.txt b/examples/widgets/itemviews/storageview/CMakeLists.txt
index 06c8afc932..99b4f13861 100644
--- a/examples/widgets/itemviews/storageview/CMakeLists.txt
+++ b/examples/widgets/itemviews/storageview/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+set(INSTALL_EXAMPLEDIR "examples/widgets/itemviews/storageview")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)