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

Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1

6 files changed, 127 insertions, 10 deletions

diff --git a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt
index 5126b41d27..5695657792 100644
--- a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt
+++ b/examples/widgets/draganddrop/draggableicons/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/draganddrop/draggableicons")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(draggableicons
-    draggableicons.qrc
     dragwidget.cpp dragwidget.h
     main.cpp
 )
 target_link_libraries(draggableicons PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(draggableicons_resource_files
+    "images/boat.png"
+    "images/car.png"
+    "images/house.png"
+)
+
+qt6_add_resources(draggableicons "draggableicons"
+    PREFIX
+        "/"
+    FILES
+        ${draggableicons_resource_files}
+)
+
 install(TARGETS draggableicons
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt
index c542a7b585..d3dfc125b2 100644
--- a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt
+++ b/examples/widgets/draganddrop/draggabletext/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/draganddrop/draggabletext")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(draggabletext
-    draggabletext.qrc
     dragwidget.cpp dragwidget.h
     main.cpp
 )
 target_link_libraries(draggabletext PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(draggabletext_resource_files
+    "words.txt"
+)
+
+qt6_add_resources(draggabletext "draggabletext"
+    PREFIX
+        "/dictionary"
+    FILES
+        ${draggabletext_resource_files}
+)
+
 install(TARGETS draggabletext
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/draganddrop/dropsite/CMakeLists.txt b/examples/widgets/draganddrop/dropsite/CMakeLists.txt
index 591edfac3d..7d6ce02b4b 100644
--- a/examples/widgets/draganddrop/dropsite/CMakeLists.txt
+++ b/examples/widgets/draganddrop/dropsite/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/draganddrop/dropsite")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(dropsite
@@ -19,6 +21,8 @@ add_qt_gui_executable(dropsite
     main.cpp
 )
 target_link_libraries(dropsite PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
diff --git a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt
index 84c097f326..31441ab7cb 100644
--- a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt
+++ b/examples/widgets/draganddrop/fridgemagnets/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/draganddrop/fridgemagnets")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(fridgemagnets
     draglabel.cpp draglabel.h
     dragwidget.cpp dragwidget.h
-    fridgemagnets.qrc
     main.cpp
 )
 target_link_libraries(fridgemagnets PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(fridgemagnets_resource_files
+    "words.txt"
+)
+
+qt6_add_resources(fridgemagnets "fridgemagnets"
+    PREFIX
+        "/dictionary"
+    FILES
+        ${fridgemagnets_resource_files}
+)
+
 install(TARGETS fridgemagnets
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt b/examples/widgets/draganddrop/puzzle/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..148f386115
--- /dev/null
+++ b/examples/widgets/draganddrop/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/draganddrop/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
+    pieceslist.cpp pieceslist.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/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt
index 99db9b4e0d..b181efd090 100644
--- a/examples/widgets/draganddrop/puzzle/CMakeLists.txt
+++ b/examples/widgets/draganddrop/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/draganddrop/draganddrop_puzzle") # special case
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 
 add_qt_gui_executable(draganddrop_puzzle # special case: renamed puzzle
     main.cpp
     mainwindow.cpp mainwindow.h
     pieceslist.cpp pieceslist.h
-    puzzle.qrc
     puzzlewidget.cpp puzzlewidget.h
 )
-target_link_libraries(draganddrop_puzzle PUBLIC # special case: renamed puzzle
+target_link_libraries(draganddrop_puzzle PUBLIC # special case
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
 
+
+# Resources:
+set(puzzle_resource_files
+    "example.jpg"
+)
+
+qt6_add_resources(draganddrop_puzzle "puzzle" # special case
+    PREFIX
+        "/images"
+    FILES
+        ${puzzle_resource_files}
+)
+
 install(TARGETS draganddrop_puzzle # special case: renamed puzzle
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"