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

Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1

2 files changed, 88 insertions, 44 deletions

diff --git a/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt
index 9c4282391e..748e1e27f3 100644
--- a/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt
+++ b/examples/widgets/graphicsview/padnavigator/.prev_CMakeLists.txt
@@ -1,45 +1,63 @@
 # Generated from padnavigator.pro.
 
-#####################################################################
-## padnavigator Binary:
-#####################################################################
-
-add_qt_executable(padnavigator
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/widgets/graphicsview/padnavigator"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/widgets/graphicsview/padnavigator"
-    SOURCES
-        flippablepad.cpp flippablepad.h
-        form.ui
-        main.cpp
-        padnavigator.cpp padnavigator.h
-        roundrectitem.cpp roundrectitem.h
-        splashitem.cpp splashitem.h
-    PUBLIC_LIBRARIES
-        Qt::Widgets
-    ENABLE_AUTOGEN_TOOLS
-        uic
+cmake_minimum_required(VERSION 3.14)
+project(padnavigator 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/graphicsview/padnavigator")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_executable(padnavigator
+    flippablepad.cpp flippablepad.h
+    form.ui
+    main.cpp
+    padnavigator.cpp padnavigator.h
+    roundrectitem.cpp roundrectitem.h
+    splashitem.cpp splashitem.h
+)
+target_link_libraries(padnavigator PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
 )
 
+
 # Resources:
-add_qt_resource(padnavigator "padnavigator" FILES
-    images/artsfftscope.png
-    images/blue_angle_swirl.jpg
-    images/kontact_contacts.png
-    images/kontact_journal.png
-    images/kontact_mail.png
-    images/kontact_notes.png
-    images/kopeteavailable.png
-    images/metacontact_online.png
-    images/minitools.png)
-
-
-#### Keys ignored in scope 1:.:.:padnavigator.pro:<TRUE>:
-# CONFIG = "console"
-
-## Scopes:
-#####################################################################
-
-extend_target(padnavigator CONDITION TARGET Qt::OpenGL
-    PUBLIC_LIBRARIES
+set(padnavigator_resource_files
+    "images/artsfftscope.png"
+    "images/blue_angle_swirl.jpg"
+    "images/kontact_contacts.png"
+    "images/kontact_journal.png"
+    "images/kontact_mail.png"
+    "images/kontact_notes.png"
+    "images/kopeteavailable.png"
+    "images/metacontact_online.png"
+    "images/minitools.png"
+)
+
+qt6_add_resources(padnavigator "padnavigator"
+    PREFIX
+        "/"
+    FILES
+        ${padnavigator_resource_files}
+)
+
+if(TARGET Qt::OpenGL)
+    target_link_libraries(padnavigator PUBLIC
         Qt::OpenGL
+    )
+endif()
+
+install(TARGETS padnavigator
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
diff --git a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
index 7fc6ec1459..7231066b72 100644
--- a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt
+++ b/examples/widgets/graphicsview/padnavigator/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/graphicsview/padnavigator")
 
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS OpenGL) # special case
 
@@ -18,18 +20,42 @@ add_executable(padnavigator
     flippablepad.cpp flippablepad.h
     form.ui
     main.cpp
-    padnavigator.cpp padnavigator.h padnavigator.qrc
+    padnavigator.cpp padnavigator.h
     roundrectitem.cpp roundrectitem.h
     splashitem.cpp splashitem.h
 )
 target_link_libraries(padnavigator PUBLIC
+    Qt::Core
+    Qt::Gui
     Qt::Widgets
 )
-# special case begin
-if (TARGET Qt::OpenGL)
-    target_link_libraries(padnavigator PUBLIC Qt::OpenGL)
+
+
+# Resources:
+set(padnavigator_resource_files
+    "images/artsfftscope.png"
+    "images/blue_angle_swirl.jpg"
+    "images/kontact_contacts.png"
+    "images/kontact_journal.png"
+    "images/kontact_mail.png"
+    "images/kontact_notes.png"
+    "images/kopeteavailable.png"
+    "images/metacontact_online.png"
+    "images/minitools.png"
+)
+
+qt6_add_resources(padnavigator "padnavigator"
+    PREFIX
+        "/"
+    FILES
+        ${padnavigator_resource_files}
+)
+
+if(TARGET Qt::OpenGL)
+    target_link_libraries(padnavigator PUBLIC
+        Qt::OpenGL
+    )
 endif()
-# special case end
 
 install(TARGETS padnavigator
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"