From c194bbaedd57e22ddf82cb992fd1a04de009a655 Mon Sep 17 00:00:00 2001
From: Rick Vogel <vrick1991@googlemail.com>
Date: Tue, 20 Dec 2022 14:01:57 +0100
Subject: [PATCH] using qt versionless approach

---
 CMakeLists.txt                          | 57 ++++++++++++++++---------
 examples/boxes/CMakeLists.txt           |  2 +-
 examples/buttons/CMakeLists.txt         |  2 +-
 examples/desktop/CMakeLists.txt         |  2 +-
 examples/frames/CMakeLists.txt          |  2 +-
 examples/gallery/CMakeLists.txt         |  2 +-
 examples/glabels/CMakeLists.txt         |  2 +-
 examples/iotdashboard/CMakeLists.txt    |  6 +--
 examples/layouts/CMakeLists.txt         |  2 +-
 examples/listbox/CMakeLists.txt         |  2 +-
 examples/messagebox/CMakeLists.txt      |  2 +-
 examples/messageboxQml/CMakeLists.txt   |  2 +-
 examples/mycontrols/CMakeLists.txt      |  2 +-
 examples/qvgviewer/CMakeLists.txt       |  2 +-
 examples/tabview/CMakeLists.txt         |  2 +-
 examples/thumbnails/CMakeLists.txt      |  2 +-
 inputcontext/CMakeLists.txt             |  4 +-
 playground/CMakeLists.txt               |  8 ++--
 playground/anchors/CMakeLists.txt       |  2 +-
 playground/dialogbuttons/CMakeLists.txt |  2 +-
 playground/dials/CMakeLists.txt         |  2 +-
 playground/grids/CMakeLists.txt         |  4 +-
 playground/images/CMakeLists.txt        |  2 +-
 playground/inputpanel/CMakeLists.txt    |  2 +-
 playground/invoker/CMakeLists.txt       |  2 +-
 playground/shadows/CMakeLists.txt       |  2 +-
 playground/webview/CMakeLists.txt       | 10 ++---
 qmlexport/CMakeLists.txt                |  2 +-
 skins/material3/CMakeLists.txt          |  4 +-
 skins/squiek/CMakeLists.txt             |  4 +-
 src/CMakeLists.txt                      | 16 +++----
 support/CMakeLists.txt                  |  4 +-
 tools/CMakeLists.txt                    |  2 +-
 tools/svg2qvg/CMakeLists.txt            | 10 ++---
 34 files changed, 95 insertions(+), 78 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cff5585..a53aca91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,29 +10,46 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 include(${CMAKE_SOURCE_DIR}/features/qskconfig.cmake)
 
-# find either Qt5 or Qt6 requred and optional components
-if(NOT "${Qt5_DIR}" STREQUAL "")
-    find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
-    find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
-    set(Qt Qt${Qt5_VERSION_MAJOR})
-    set(Qt_VERSION       ${Qt5_VERSION})
-    set(Qt_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
-    set(Qt_VERSION_MINOR ${Qt5_VERSION_MINOR})
-    set(Qt_VERSION_PATCH ${Qt5_VERSION_PATCH})
-elseif(NOT "${Qt6_DIR}" STREQUAL "")
-    string(REPLACE "/lib/cmake/Qt6" "" Qt6_PREFIX_DIR "${Qt6_DIR}")
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${Qt6_PREFIX_DIR})
-    find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
-    find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick) # check optional QuickWidgets Svg Widgets 
-    set(Qt Qt${Qt6_VERSION_MAJOR})
-    set(Qt_VERSION       ${Qt6_VERSION})
-    set(Qt_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
-    set(Qt_VERSION_MINOR ${Qt6_VERSION_MINOR})
-    set(Qt_VERSION_PATCH ${Qt6_VERSION_PATCH})
+find_package(Qt6 COMPONENTS Core QUIET)
+if (NOT Qt6_FOUND)
+    find_package(Qt5 5.15 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
+    find_package(Qt5 5.15 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
+    message(WARNING "using QSkinny's 'qt_add_executable()'")
+    function(qt_add_executable)
+        add_executable(${ARGV})
+    endfunction(qt_add_executable)
+    message(WARNING "using QSkinny's 'qt_add_library()'")
+    function(qt_add_library)
+        add_library(${ARGV})
+    endfunction(qt_add_library)
 else()
-    message(FATAL_ERROR "Neither Qt5_DIR nor Qt6_DIR defined!")
+    find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
+    find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick)
 endif()
 
+# find either Qt5 or Qt6 requred and optional components
+#if(NOT "${Qt5_DIR}" STREQUAL "")
+#    find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
+#    find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
+#    set(Qt Qt${Qt5_VERSION_MAJOR})
+#    set(Qt_VERSION       ${Qt5_VERSION})
+#    set(Qt_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
+#    set(Qt_VERSION_MINOR ${Qt5_VERSION_MINOR})
+#    set(Qt_VERSION_PATCH ${Qt5_VERSION_PATCH})
+#elseif(NOT "${Qt6_DIR}" STREQUAL "")
+#    string(REPLACE "/lib/cmake/Qt6" "" Qt6_PREFIX_DIR "${Qt6_DIR}")
+#    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${Qt6_PREFIX_DIR})
+#    find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
+#    find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick) # check optional QuickWidgets Svg Widgets 
+#    set(Qt Qt${Qt6_VERSION_MAJOR})
+#    set(Qt_VERSION       ${Qt6_VERSION})
+#    set(Qt_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
+#    set(Qt_VERSION_MINOR ${Qt6_VERSION_MINOR})
+#    set(Qt_VERSION_PATCH ${Qt6_VERSION_PATCH})
+#else()
+#    message(FATAL_ERROR "Neither Qt5_DIR nor Qt6_DIR defined!")
+#endif()
+
 # optional package hunspell
 if(NOT LINUX AND ENABLE_HUNSPELL)
     message(WARNING "Feature 'hunspell' only available for UNIX!")
diff --git a/examples/boxes/CMakeLists.txt b/examples/boxes/CMakeLists.txt
index f271cf1a..de145119 100644
--- a/examples/boxes/CMakeLists.txt
+++ b/examples/boxes/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME boxes)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/examples/buttons/CMakeLists.txt b/examples/buttons/CMakeLists.txt
index 556b5f6a..1efe622b 100644
--- a/examples/buttons/CMakeLists.txt
+++ b/examples/buttons/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME buttons)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
 
 target_link_libraries(${TARGET_NAME}
     PRIVATE
diff --git a/examples/desktop/CMakeLists.txt b/examples/desktop/CMakeLists.txt
index b64031e3..97a461c5 100644
--- a/examples/desktop/CMakeLists.txt
+++ b/examples/desktop/CMakeLists.txt
@@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME desktop)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/examples/frames/CMakeLists.txt b/examples/frames/CMakeLists.txt
index f1a039fa..a72b6c94 100644
--- a/examples/frames/CMakeLists.txt
+++ b/examples/frames/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME frames)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
 
 target_link_libraries(${TARGET_NAME}
     PRIVATE
diff --git a/examples/gallery/CMakeLists.txt b/examples/gallery/CMakeLists.txt
index c390ccca..379fbb4d 100644
--- a/examples/gallery/CMakeLists.txt
+++ b/examples/gallery/CMakeLists.txt
@@ -49,7 +49,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME gallery)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/examples/glabels/CMakeLists.txt b/examples/glabels/CMakeLists.txt
index a6f463cc..c43253c6 100644
--- a/examples/glabels/CMakeLists.txt
+++ b/examples/glabels/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME glabels)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
 
 target_link_libraries(${TARGET_NAME}
     PRIVATE
diff --git a/examples/iotdashboard/CMakeLists.txt b/examples/iotdashboard/CMakeLists.txt
index 2e645217..5b04432f 100644
--- a/examples/iotdashboard/CMakeLists.txt
+++ b/examples/iotdashboard/CMakeLists.txt
@@ -69,7 +69,7 @@ list(APPEND TARGET_RESSOURCES
 
 set(TARGET_NAME iotdashboard)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES}
     ${TARGET_HEADERS}
     ${TARGET_RESSOURCES})
@@ -87,13 +87,13 @@ if(TARGET Qsk::qskinny)
     target_link_libraries(${TARGET_NAME}
         PRIVATE
             Qsk::qskinny
-            ${Qt}::Svg)
+            Qt::Svg)
 else()
     target_link_libraries(${TARGET_NAME}
         PRIVATE
             qskinny
             qsktestsupport
-            ${Qt}::Svg)
+            Qt::Svg)
 
     target_compile_definitions(${TARGET_NAME}
         PRIVATE
diff --git a/examples/layouts/CMakeLists.txt b/examples/layouts/CMakeLists.txt
index 1671b7c9..f6af2099 100644
--- a/examples/layouts/CMakeLists.txt
+++ b/examples/layouts/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME layouts)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/examples/listbox/CMakeLists.txt b/examples/listbox/CMakeLists.txt
index d02b9227..5ab4c420 100644
--- a/examples/listbox/CMakeLists.txt
+++ b/examples/listbox/CMakeLists.txt
@@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME listbox)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/examples/messagebox/CMakeLists.txt b/examples/messagebox/CMakeLists.txt
index acfa5e4c..3801e403 100644
--- a/examples/messagebox/CMakeLists.txt
+++ b/examples/messagebox/CMakeLists.txt
@@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME messagebox)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/examples/messageboxQml/CMakeLists.txt b/examples/messageboxQml/CMakeLists.txt
index 93936fa5..eda4b65f 100644
--- a/examples/messageboxQml/CMakeLists.txt
+++ b/examples/messageboxQml/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME messageboxQml)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_RESSOURCES})
 
 target_link_libraries(${TARGET_NAME}
     PRIVATE
diff --git a/examples/mycontrols/CMakeLists.txt b/examples/mycontrols/CMakeLists.txt
index 2b1bd227..c99f285c 100644
--- a/examples/mycontrols/CMakeLists.txt
+++ b/examples/mycontrols/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND TARGET_HEADERS
 
 set(TARGET_NAME mycontrols)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/examples/qvgviewer/CMakeLists.txt b/examples/qvgviewer/CMakeLists.txt
index 124d50af..87ea3e66 100644
--- a/examples/qvgviewer/CMakeLists.txt
+++ b/examples/qvgviewer/CMakeLists.txt
@@ -22,7 +22,7 @@ list(APPEND TARGET_QVGS
 
 set(TARGET_NAME qvgviewer)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES}
     ${TARGET_HEADERS}
     ${TARGET_RESSOURCES}
diff --git a/examples/tabview/CMakeLists.txt b/examples/tabview/CMakeLists.txt
index 737693ef..c421f75f 100644
--- a/examples/tabview/CMakeLists.txt
+++ b/examples/tabview/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME tabview)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/examples/thumbnails/CMakeLists.txt b/examples/thumbnails/CMakeLists.txt
index e743e583..d294a19a 100644
--- a/examples/thumbnails/CMakeLists.txt
+++ b/examples/thumbnails/CMakeLists.txt
@@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME thumbnails)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/inputcontext/CMakeLists.txt b/inputcontext/CMakeLists.txt
index ba093f9b..fc6012bb 100644
--- a/inputcontext/CMakeLists.txt
+++ b/inputcontext/CMakeLists.txt
@@ -23,7 +23,7 @@ if(ENABLE_HUNSPELL)
         ${CMAKE_SOURCE_DIR}/src/inputpanel/QskHunspellTextPredictor.cpp)
 endif()
 
-add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_OTHER_FILES})
+qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_OTHER_FILES})
 
 if(ENABLE_PINYIN)
     target_link_libraries(${TARGET_NAME}
@@ -47,7 +47,7 @@ endif()
 target_link_libraries(${TARGET_NAME}
     PRIVATE
         qskinny
-        ${Qt}::GuiPrivate)
+        Qt::GuiPrivate)
 
 set_target_properties(${TARGET_NAME} PROPERTIES
     AUTOMOC ON)
diff --git a/playground/CMakeLists.txt b/playground/CMakeLists.txt
index 2e518423..37a0cae7 100644
--- a/playground/CMakeLists.txt
+++ b/playground/CMakeLists.txt
@@ -7,17 +7,17 @@ add_subdirectory(images)
 add_subdirectory(shadows)
 
 if (Qt_VERSION_MAJOR VERSION_EQUAL "6")
-    if(TARGET ${Qt}::WebEngineCore)
-        if(TARGET ${Qt}::WebEngineQuick)
+    if(TARGET Qt::WebEngineCore)
+        if(TARGET Qt::WebEngineQuick)
             add_subdirectory(webview)
         endif()
     endif()
 elseif(Qt_VERSION VERSION_EQUAL "5")
-    if(TARGET ${Qt}::WebEngine)
+    if(TARGET Qt::WebEngine)
         add_subdirectory(webview)
     endif()
 endif()
 
-if(TARGET ${Qt}::QuickWidgets)
+if(TARGET Qt::QuickWidgets)
     add_subdirectory(grids)
 endif()
diff --git a/playground/anchors/CMakeLists.txt b/playground/anchors/CMakeLists.txt
index 70d1ec41..201d3305 100644
--- a/playground/anchors/CMakeLists.txt
+++ b/playground/anchors/CMakeLists.txt
@@ -20,7 +20,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME anchors)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES}
     ${TARGET_HEADERS}
     ${TARGET_RESSOURCES})
diff --git a/playground/dialogbuttons/CMakeLists.txt b/playground/dialogbuttons/CMakeLists.txt
index afdc238a..7109270c 100644
--- a/playground/dialogbuttons/CMakeLists.txt
+++ b/playground/dialogbuttons/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND TARGET_SOURCES
     Window.cpp
     main.cpp)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
 
 target_link_libraries(${TARGET_NAME}
    PRIVATE
diff --git a/playground/dials/CMakeLists.txt b/playground/dials/CMakeLists.txt
index a25a8bc3..d10a209a 100644
--- a/playground/dials/CMakeLists.txt
+++ b/playground/dials/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND TARGET_RESSOURCES
 
 set(TARGET_NAME dials)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES}
     ${TARGET_HEADERS}
     ${TARGET_RESSOURCES})
diff --git a/playground/grids/CMakeLists.txt b/playground/grids/CMakeLists.txt
index ddf0a57a..62fdf9b5 100644
--- a/playground/grids/CMakeLists.txt
+++ b/playground/grids/CMakeLists.txt
@@ -18,7 +18,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME grid)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES}
     ${TARGET_HEADERS})
 
@@ -26,7 +26,7 @@ target_link_libraries(${TARGET_NAME}
     PRIVATE
         qskinny
         qsktestsupport
-        ${Qt}::QuickWidgets)
+        Qt::QuickWidgets)
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/playground/images/CMakeLists.txt b/playground/images/CMakeLists.txt
index 969af8e9..47acbc84 100644
--- a/playground/images/CMakeLists.txt
+++ b/playground/images/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME images)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES}
     ${TARGET_HEADERS}
     ${TARGET_RESSOURCES})
diff --git a/playground/inputpanel/CMakeLists.txt b/playground/inputpanel/CMakeLists.txt
index 70c3b21b..b06ceeac 100644
--- a/playground/inputpanel/CMakeLists.txt
+++ b/playground/inputpanel/CMakeLists.txt
@@ -3,7 +3,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME inputpanel)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES})
 
 target_link_libraries(${TARGET_NAME}
diff --git a/playground/invoker/CMakeLists.txt b/playground/invoker/CMakeLists.txt
index 9560b690..ef4afc3a 100644
--- a/playground/invoker/CMakeLists.txt
+++ b/playground/invoker/CMakeLists.txt
@@ -9,7 +9,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME invoker)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES}
     ${TARGET_HEADERS})
 
diff --git a/playground/shadows/CMakeLists.txt b/playground/shadows/CMakeLists.txt
index c92e5238..054bdfbf 100644
--- a/playground/shadows/CMakeLists.txt
+++ b/playground/shadows/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME shadows)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_HEADERS}
     ${TARGET_SOURCES})
 
diff --git a/playground/webview/CMakeLists.txt b/playground/webview/CMakeLists.txt
index 6be06743..55f673a0 100644
--- a/playground/webview/CMakeLists.txt
+++ b/playground/webview/CMakeLists.txt
@@ -4,7 +4,7 @@ list(APPEND TARGET_SOURCES
 
 set(TARGET_NAME webview)
 
-add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
+qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
     ${TARGET_SOURCES})
 
 target_link_libraries(${TARGET_NAME}
@@ -15,13 +15,13 @@ target_link_libraries(${TARGET_NAME}
 if (Qt_VERSION_MAJOR VERSION_GREATER "5")
     target_link_libraries(${TARGET_NAME}
         PRIVATE
-            ${Qt}::WebEngineQuick
-            ${Qt}::WebEngineQuickPrivate)
+            Qt::WebEngineQuick
+            Qt::WebEngineQuickPrivate)
 else()
     target_link_libraries(${TARGET_NAME}
         PRIVATE
-            ${Qt}::WebEngine
-            ${Qt}::WebEnginePrivate)
+            Qt::WebEngine
+            Qt::WebEnginePrivate)
 endif()
 
 set_target_properties(${TARGET_NAME}
diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt
index 4bd6b8fa..82894705 100644
--- a/qmlexport/CMakeLists.txt
+++ b/qmlexport/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND TARGET_SOURCES
     QskMainQml.cpp
     QskQml.cpp)
 
-add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
+qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
 
 set_target_properties(${TARGET_NAME}
     PROPERTIES
diff --git a/skins/material3/CMakeLists.txt b/skins/material3/CMakeLists.txt
index c117b02e..0df4d1f2 100644
--- a/skins/material3/CMakeLists.txt
+++ b/skins/material3/CMakeLists.txt
@@ -15,9 +15,9 @@ list(APPEND TARGET_OTHER_FILES
     metadata.json)
 
 if(BUILD_QSKDLL)
-    add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
+    qt_add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
 else()
-    add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
+    qt_add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
 endif()
 
 target_link_libraries(${TARGET_NAME} PRIVATE qskinny)
diff --git a/skins/squiek/CMakeLists.txt b/skins/squiek/CMakeLists.txt
index 47c120e3..1adabe6c 100644
--- a/skins/squiek/CMakeLists.txt
+++ b/skins/squiek/CMakeLists.txt
@@ -15,9 +15,9 @@ list(APPEND TARGET_OTHER_FILES
     metadata.json)
 
 if(BUILD_QSKDLL)
-    add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
+    qt_add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
 else()
-    add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
+    qt_add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
 endif()
 
 target_link_libraries(${TARGET_NAME}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed4b122b..4ab964ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -379,9 +379,9 @@ endif()
 set(TARGET_NAME qskinny)
 
 if(BUILD_QSKDLL)
-    add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
+    qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
 else()
-    add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
+    qt_add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
 endif()
 
 if(BUILD_QSKDLL)
@@ -408,16 +408,16 @@ target_include_directories(${TARGET_NAME}
 
 target_link_libraries(${TARGET_NAME}
     PUBLIC
-        ${Qt}::Core
-        ${Qt}::CorePrivate
-        ${Qt}::Quick
-        ${Qt}::QuickPrivate)
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Quick
+        Qt::QuickPrivate)
 
 if (Qt_VERSION_MAJOR VERSION_GREATER "5")
     target_link_libraries(${TARGET_NAME}
         PUBLIC
-            ${Qt}::OpenGL
-            ${Qt}::OpenGLPrivate)
+            Qt::OpenGL
+            Qt::OpenGLPrivate)
 endif()
 
 if(ENABLE_HUNSPELL)
diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
index a1bec638..ac672a4e 100644
--- a/support/CMakeLists.txt
+++ b/support/CMakeLists.txt
@@ -14,9 +14,9 @@ list(APPEND TARGET_SOURCES
 set(TARGET_NAME qsktestsupport)
 
 if (BUILD_QSKDLL)
-    add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
+    qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
 else()
-    add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS})
+    qt_add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS})
 endif()
 
 if(ENABLE_FONT_CONFIG)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index bc768dd1..74da26cc 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(TARGET ${Qt}::Svg)
+if(TARGET Qt::Svg)
     add_subdirectory(svg2qvg)
 endif()
\ No newline at end of file
diff --git a/tools/svg2qvg/CMakeLists.txt b/tools/svg2qvg/CMakeLists.txt
index cd2f559d..30f3bc04 100644
--- a/tools/svg2qvg/CMakeLists.txt
+++ b/tools/svg2qvg/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(TARGET_NAME svg2qvg)
 set(TARGET_SOURCES main.cpp)
 
-add_executable(${TARGET_NAME} ${TARGET_SOURCES})
+qt_add_executable(${TARGET_NAME} ${TARGET_SOURCES})
 
 if(BUILD_SVG2QVG_STANDALONE)
 
@@ -36,14 +36,14 @@ if(BUILD_SVG2QVG_STANDALONE)
 
     target_link_libraries(${TARGET_NAME}
         PRIVATE
-            ${Qt}::Gui
-            ${Qt}::GuiPrivate
-            ${Qt}::Svg)
+            Qt::Gui
+            Qt::GuiPrivate
+            Qt::Svg)
 else()
     target_link_libraries(${TARGET_NAME}
         PRIVATE
             qskinny
-            ${Qt}::Svg)
+            Qt::Svg)
 endif()
 
 set_target_properties(${TARGET_NAME}