Build system: Clean Qt libraries linked by the modules

Only the bound Qt library needs to be linked, it will bring its
dependencies.

Add explanatory comment for the exceptions (QtTest, QtSql).

Pick-to: 6.7
Task-number: PYSIDE-2649
Change-Id: Ib84d37248578a76400d307bb5d050005110677c3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

36 files changed, 75 insertions, 202 deletions

diff --git a/sources/pyside6/PySide6/QtCharts/CMakeLists.txt b/sources/pyside6/PySide6/QtCharts/CMakeLists.txt
index f7a4d3cc6..20126fdee 100644
--- a/sources/pyside6/PySide6/QtCharts/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtCharts/CMakeLists.txt
@@ -73,10 +73,7 @@ set(QtCharts_include_dirs ${QtCharts_SOURCE_DIR}
                           ${QtWidgets_GEN_DIR})
 
 set(QtCharts_libraries    pyside6
-                          ${Qt${QT_MAJOR_VERSION}Charts_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES})
+                          ${Qt${QT_MAJOR_VERSION}Charts_LIBRARIES})
 
 set(QtCharts_deps QtCore QtGui QtWidgets)
 
diff --git a/sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt b/sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt
index c32ff17fd..134e44ed9 100644
--- a/sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt
@@ -18,12 +18,11 @@ set(QtConcurrent_include_dirs   ${QtConcurrent_SOURCE_DIR}
                                 ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
                                 ${Qt${QT_MAJOR_VERSION}Concurrent_INCLUDE_DIRS}
                                 ${libpyside_SOURCE_DIR}
-                                ${QtCore_GEN_DIR}
-                                )
-set(QtConcurrent_libraries  pyside6
-                            ${QtConcurrent_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                            )
+                                ${QtCore_GEN_DIR})
+
+set(QtConcurrent_libraries pyside6
+                           ${Qt${QT_MAJOR_VERSION}Concurrent_LIBRARIES})
+
 set(QtConcurrent_deps QtCore)
 
 create_pyside_module(NAME QtConcurrent
diff --git a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
index b7ec9e4e2..1276b424f 100644
--- a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
@@ -54,10 +54,8 @@ set(QtDataVisualization_include_dirs ${QtDataVisualization_SOURCE_DIR}
                           ${QtCore_GEN_DIR}
                           ${QtGui_GEN_DIR})
 
-set(QtDataVisualization_libraries    pyside6
-                          ${Qt${QT_MAJOR_VERSION}DataVisualization_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES})
+set(QtDataVisualization_libraries pyside6
+                                  ${Qt${QT_MAJOR_VERSION}DataVisualization_LIBRARIES})
 
 set(QtDataVisualization_deps QtCore QtGui)
 
diff --git a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
index 20be3a7de..e91532b87 100644
--- a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
@@ -51,14 +51,11 @@ set(QtDesigner_include_dirs ${QtDesigner_SOURCE_DIR}
                             ${QtDesigner_BINARY_DIR}
                             ${QtCore_GEN_DIR}
                             ${QtGui_GEN_DIR}
-                            ${QtWidgets_GEN_DIR}
-                            )
+                            ${QtWidgets_GEN_DIR})
+
 set(QtDesigner_libraries pyside6
-                         ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                         ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                         ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                         ${Qt${QT_MAJOR_VERSION}Designer_LIBRARIES}
-                         )
+                         ${Qt${QT_MAJOR_VERSION}Designer_LIBRARIES})
+
 set(QtDesigner_deps QtWidgets)
 
 create_pyside_module(NAME QtDesigner
diff --git a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
index 96977e874..d8acb772f 100644
--- a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
@@ -80,16 +80,7 @@ set(QtGraphs_include_dirs ${QtGraphs_SOURCE_DIR}
                           ${QtQuick3D_GEN_DIR})
 
 set(QtGraphs_libraries    pyside6
-                          ${Qt${QT_MAJOR_VERSION}Graphs_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}QuickWidgets_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Quick3D_LIBRARIES})
+                          ${Qt${QT_MAJOR_VERSION}Graphs_LIBRARIES})
 
 set(QtGraphs_deps QtCore QtNetwork QtGui QtWidgets QtQml QtOpenGL QtQuick QtQuickWidgets QtQuick3D)
 
diff --git a/sources/pyside6/PySide6/QtHelp/CMakeLists.txt b/sources/pyside6/PySide6/QtHelp/CMakeLists.txt
index 88697dbab..85bda0c10 100644
--- a/sources/pyside6/PySide6/QtHelp/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtHelp/CMakeLists.txt
@@ -40,9 +40,6 @@ set(QtHelp_include_dirs ${QtHelp_SOURCE_DIR}
                         ${QtCore_GEN_DIR}
                         )
 set(QtHelp_libraries  pyside6
-                      ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Help_LIBRARIES})
 
 set(QtHelp_deps QtWidgets)
diff --git a/sources/pyside6/PySide6/QtHttpServer/CMakeLists.txt b/sources/pyside6/PySide6/QtHttpServer/CMakeLists.txt
index 9bd43e62b..c931f064f 100644
--- a/sources/pyside6/PySide6/QtHttpServer/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtHttpServer/CMakeLists.txt
@@ -28,11 +28,7 @@ set(QtHttpServer_include_dirs ${QtHttpServer_SOURCE_DIR}
                                 ${QtWebSockets_GEN_DIR})
 
 set(QtHttpServer_libraries pyside6
-                           ${Qt${QT_MAJOR_VERSION}HttpServer_LIBRARIES}
-                           ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                           ${Qt${QT_MAJOR_VERSION}Concurrent_LIBRARIES}
-                           ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                           ${Qt${QT_MAJOR_VERSION}WebSockets_LIBRARIES})
+                           ${Qt${QT_MAJOR_VERSION}HttpServer_LIBRARIES})
 
 set(QtHttpServer_deps QtCore QtConcurrent QtNetwork QtWebSockets)
 
diff --git a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt
index 61f52cc2b..321486e39 100644
--- a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt
@@ -51,11 +51,8 @@ set(QtMultimedia_include_dirs   ${QtMultimedia_SOURCE_DIR}
                                 ${QtNetwork_GEN_DIR})
 
 set(QtMultimedia_libraries  pyside6
-                            ${Qt${QT_MAJOR_VERSION}Multimedia_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                            )
+                            ${Qt${QT_MAJOR_VERSION}Multimedia_LIBRARIES})
+
 set(QtMultimedia_deps QtCore QtGui QtNetwork)
 
 create_pyside_module(NAME QtMultimedia
diff --git a/sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt
index e3d8ca0ea..c3988551e 100644
--- a/sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtMultimediaWidgets/CMakeLists.txt
@@ -26,12 +26,8 @@ set(QtMultimediaWidgets_include_dirs ${QtMultimediaWidgets_SOURCE_DIR}
                                      ${QtMultimedia_GEN_DIR})
 
 set(QtMultimediaWidgets_libraries    pyside6
-                                     ${Qt${QT_MAJOR_VERSION}Multimedia_LIBRARIES}
-                                     ${Qt${QT_MAJOR_VERSION}MultimediaWidgets_LIBRARIES}
-                                     ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                                     ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                                     ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                                     ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES})
+                                     ${Qt${QT_MAJOR_VERSION}MultimediaWidgets_LIBRARIES})
+
 
 set(QtMultimediaWidgets_deps QtCore QtGui QtNetwork QtWidgets QtMultimedia)
 
diff --git a/sources/pyside6/PySide6/QtNetworkAuth/CMakeLists.txt b/sources/pyside6/PySide6/QtNetworkAuth/CMakeLists.txt
index d1d5d408d..4d9498e4d 100644
--- a/sources/pyside6/PySide6/QtNetworkAuth/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtNetworkAuth/CMakeLists.txt
@@ -26,8 +26,6 @@ set(QtNetworkAuth_include_dirs ${QtNetworkAuth_SOURCE_DIR}
                                ${QtNetworkAuth_GEN_DIR})
 
 set(QtNetworkAuth_libraries pyside6
-                            ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
                             ${Qt${QT_MAJOR_VERSION}NetworkAuth_LIBRARIES})
 
 set(QtNetworkAuth_deps QtNetwork)
diff --git a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt
index a5ee6c6fa..5bf8b5f3b 100644
--- a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt
@@ -87,8 +87,6 @@ set(QtOpenGL_include_dirs   ${QtOpenGL_SOURCE_DIR}
                             ${QtOpenGL_GEN_DIR}
                             )
 set(QtOpenGL_libraries      pyside6
-                            ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
                             ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES})
 set(QtOpenGL_deps QtGui)
 
diff --git a/sources/pyside6/PySide6/QtOpenGLWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtOpenGLWidgets/CMakeLists.txt
index 14f9afae3..8c7386130 100644
--- a/sources/pyside6/PySide6/QtOpenGLWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtOpenGLWidgets/CMakeLists.txt
@@ -21,10 +21,6 @@ set(QtOpenGLWidgets_include_dirs ${QtOpenGLWidgets_SOURCE_DIR}
                                  ${QtOpenGLWidgets_GEN_DIR})
 
 set(QtOpenGLWidgets_libraries pyside6
-                              ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                              ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                              ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
-                              ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
                               ${Qt${QT_MAJOR_VERSION}OpenGLWidgets_LIBRARIES})
 
 set(QtOpenGLWidgets_deps QtOpenGL QtWidgets)
diff --git a/sources/pyside6/PySide6/QtPdf/CMakeLists.txt b/sources/pyside6/PySide6/QtPdf/CMakeLists.txt
index c058e9a5c..5b9c1457d 100644
--- a/sources/pyside6/PySide6/QtPdf/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtPdf/CMakeLists.txt
@@ -29,10 +29,7 @@ set(QtPdf_include_dirs ${QtPdf_SOURCE_DIR}
                        ${QtNetwork_GEN_DIR})
 
 set(QtPdf_libraries pyside6
-    ${Qt${QT_MAJOR_VERSION}Pdf_LIBRARIES}
-    ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-    ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-    ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES})
+                    ${Qt${QT_MAJOR_VERSION}Pdf_LIBRARIES})
 
 set(QtPdf_deps QtCore QtGui QtNetwork)
 
diff --git a/sources/pyside6/PySide6/QtPdfWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtPdfWidgets/CMakeLists.txt
index 93ad3638d..de1335f8a 100644
--- a/sources/pyside6/PySide6/QtPdfWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtPdfWidgets/CMakeLists.txt
@@ -26,12 +26,7 @@ set(QtPdfWidgets_include_dirs ${QtPdfWidgets_SOURCE_DIR}
                               ${QtPdf_GEN_DIR})
 
 set(QtPdfWidgets_libraries pyside6
-    ${Qt${QT_MAJOR_VERSION}Pdf_LIBRARIES}
-    ${Qt${QT_MAJOR_VERSION}PdfWidgets_LIBRARIES}
-    ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-    ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-    ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-    ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES})
+                           ${Qt${QT_MAJOR_VERSION}PdfWidgets_LIBRARIES})
 
 set(QtPdfWidgets_deps QtCore QtGui QtNetwork QtWidgets QtPdf)
 
diff --git a/sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt b/sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt
index 615d202fe..fb0db5f83 100644
--- a/sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt
@@ -25,14 +25,11 @@ set(QtPrintSupport_include_dirs ${QtPrintSupport_SOURCE_DIR}
                                 ${libpyside_SOURCE_DIR}
                                 ${QtCore_GEN_DIR}
                                 ${QtGui_GEN_DIR}
-                                ${QtWidgets_GEN_DIR}
-                                )
+                                ${QtWidgets_GEN_DIR})
+
 set(QtPrintSupport_libraries    pyside6
-                                ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                                ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                                ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                                ${Qt${QT_MAJOR_VERSION}PrintSupport_LIBRARIES}
-                                )
+                                ${Qt${QT_MAJOR_VERSION}PrintSupport_LIBRARIES})
+
 set(QtPrintSupport_deps QtWidgets)
 create_pyside_module(NAME QtPrintSupport
                      INCLUDE_DIRS QtPrintSupport_include_dirs
diff --git a/sources/pyside6/PySide6/QtQml/CMakeLists.txt b/sources/pyside6/PySide6/QtQml/CMakeLists.txt
index 676f55a25..87de1d7dd 100644
--- a/sources/pyside6/PySide6/QtQml/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQml/CMakeLists.txt
@@ -63,8 +63,6 @@ set(QtQml_include_dirs  ${QtQml_SOURCE_DIR}
                         ${QtQml_GEN_DIR})
 
 set(QtQml_libraries pyside6 pyside6qml
-                    ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                    ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
                     ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES})
 
 set(QtQml_deps QtNetwork)
diff --git a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt
index 93b1b52b2..8342d414c 100644
--- a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt
@@ -90,11 +90,6 @@ set(QtQuick_include_dirs  ${QtQuick_SOURCE_DIR}
                           ${QtQuick_GEN_DIR})
 
 set(QtQuick_libraries pyside6 pyside6qml
-                      ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES})
 
 set(QtQuick_deps QtGui QtOpenGL QtNetwork QtQml)
diff --git a/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt b/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt
index 3d173c7ea..2d49c8d21 100644
--- a/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt
@@ -38,13 +38,7 @@ set(QtQuick3D_include_dirs  ${QtQuick3D_SOURCE_DIR}
                           ${QtQuick3D_GEN_DIR})
 
 set(QtQuick3D_libraries pyside6
-                      ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Quick3D_LIBRARIES})
+                        ${Qt${QT_MAJOR_VERSION}Quick3D_LIBRARIES})
 
 set(QtQuick3D_deps QtGui QtOpenGL QtNetwork QtQml QtQuick)
 
diff --git a/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt b/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt
index 0ba33b5ff..2cb95de98 100644
--- a/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt
@@ -29,13 +29,7 @@ set(QtQuickControls2_include_dirs ${QtQuickControls2_SOURCE_DIR}
                                   ${QtQuickControls2_GEN_DIR})
 
 set(QtQuickControls2_libraries pyside6
-                      ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES}
-                      ${Qt${QT_MAJOR_VERSION}QuickControls2_LIBRARIES})
+                               ${Qt${QT_MAJOR_VERSION}QuickControls2_LIBRARIES})
 
 set(QtQuickControls2_deps QtGui QtOpenGL QtNetwork QtQml QtQuick)
 
diff --git a/sources/pyside6/PySide6/QtQuickTest/CMakeLists.txt b/sources/pyside6/PySide6/QtQuickTest/CMakeLists.txt
index cd224f2b0..4a670d1db 100644
--- a/sources/pyside6/PySide6/QtQuickTest/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQuickTest/CMakeLists.txt
@@ -26,12 +26,6 @@ set(QtQuickTest_include_dirs ${QtQuickTest_SOURCE_DIR}
                              ${QtQuickTest_GEN_DIR})
 
 set(QtQuickTest_libraries pyside6
-                          ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
-                          ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES}
                           ${Qt${QT_MAJOR_VERSION}QuickTest_LIBRARIES})
 
 set(QtQuickTest_deps QtGui QtOpenGL QtNetwork QtQml QtQuick)
diff --git a/sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt
index bab2fa5b0..5afec6ee1 100644
--- a/sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt
@@ -30,13 +30,6 @@ set(QtQuickWidgets_include_dirs  ${QtQuickWidgets_SOURCE_DIR}
                                  ${QtQuickWidgets_GEN_DIR})
 
 set(QtQuickWidgets_libraries pyside6
-                             ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
                              ${Qt${QT_MAJOR_VERSION}QuickWidgets_LIBRARIES})
 
 set(QtQuickWidgets_deps QtGui QtOpenGL QtQml QtQuick QtWidgets QtNetwork)
diff --git a/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt b/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt
index a96af846f..8d7126bb1 100644
--- a/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt
@@ -32,8 +32,6 @@ set(QtRemoteObjects_include_dirs ${QtRemoteObjects_SOURCE_DIR}
                                  ${QtCore_GEN_DIR})
 
 set(QtRemoteObjects_libraries    pyside6
-                                 ${SHIBOKEN_PYTHON_LIBRARIES}
-                                 ${SHIBOKEN_LIBRARY}
                                  ${Qt${QT_MAJOR_VERSION}RemoteObjects_LIBRARIES})
 
 set(QtRemoteObjects_deps QtCore QtNetwork)
diff --git a/sources/pyside6/PySide6/QtSpatialAudio/CMakeLists.txt b/sources/pyside6/PySide6/QtSpatialAudio/CMakeLists.txt
index 409759b6f..966c0ffe8 100644
--- a/sources/pyside6/PySide6/QtSpatialAudio/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtSpatialAudio/CMakeLists.txt
@@ -28,12 +28,8 @@ set(QtSpatialAudio_include_dirs ${QtSpatialAudio_SOURCE_DIR}
                                 ${QtMultimedia_GEN_DIR})
 
 set(QtSpatialAudio_libraries pyside6
-                             ${Qt${QT_MAJOR_VERSION}SpatialAudio_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                             ${Qt${QT_MAJOR_VERSION}Multimedia_LIBRARIES}
-                             )
+                             ${Qt${QT_MAJOR_VERSION}SpatialAudio_LIBRARIES})
+
 set(QtSpatialAudio_deps QtCore QtGui QtNetwork QtMultimedia)
 
 create_pyside_module(NAME QtSpatialAudio
diff --git a/sources/pyside6/PySide6/QtSql/CMakeLists.txt b/sources/pyside6/PySide6/QtSql/CMakeLists.txt
index 2150eb3c9..fedebe642 100644
--- a/sources/pyside6/PySide6/QtSql/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtSql/CMakeLists.txt
@@ -35,13 +35,13 @@ set(QtSql_include_dirs  ${QtSql_SOURCE_DIR}
                         ${libpyside_SOURCE_DIR}
                         ${QtCore_GEN_DIR}
                         ${QtGui_GEN_DIR}
-                        ${QtWidgets_GEN_DIR}
-                        )
+                        ${QtWidgets_GEN_DIR})
+
+# Link to QtWidgets to enable QSqlRelationalDelegate
 set(QtSql_libraries     pyside6
-                        ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
                         ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
                         ${Qt${QT_MAJOR_VERSION}Sql_LIBRARIES})
+
 set(QtSql_deps QtWidgets)
 
 create_pyside_module(NAME QtSql
diff --git a/sources/pyside6/PySide6/QtStateMachine/CMakeLists.txt b/sources/pyside6/PySide6/QtStateMachine/CMakeLists.txt
index 88a4805e1..2b4cc348d 100644
--- a/sources/pyside6/PySide6/QtStateMachine/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtStateMachine/CMakeLists.txt
@@ -26,13 +26,11 @@ set(QtStateMachine_include_dirs  ${QtStateMachine_SOURCE_DIR}
                             ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS}
                             ${libpyside_SOURCE_DIR}
                             ${QtCore_GEN_DIR}
-                            ${QtGui_GEN_DIR}
-                            )
+                            ${QtGui_GEN_DIR})
+
 set(QtStateMachine_libraries pyside6
-                        ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}StateMachine_LIBRARIES}
-                        )
+                             ${Qt${QT_MAJOR_VERSION}StateMachine_LIBRARIES})
+
 set(QtStateMachine_deps QtGui)
 
 create_pyside_module(NAME QtStateMachine
diff --git a/sources/pyside6/PySide6/QtSvg/CMakeLists.txt b/sources/pyside6/PySide6/QtSvg/CMakeLists.txt
index a867df620..5451380cc 100644
--- a/sources/pyside6/PySide6/QtSvg/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtSvg/CMakeLists.txt
@@ -18,13 +18,12 @@ set(QtSvg_include_dirs  ${QtSvg_SOURCE_DIR}
                         ${Qt${QT_MAJOR_VERSION}Svg_INCLUDE_DIRS}
                         ${libpyside_SOURCE_DIR}
                         ${QtCore_GEN_DIR}
-                        ${QtGui_GEN_DIR}
-                        )
+                        ${QtGui_GEN_DIR})
+
 set(QtSvg_libraries     pyside6
-                        ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Svg_LIBRARIES}
-                        )
+                        ${Qt${QT_MAJOR_VERSION}Svg_LIBRARIES})
+
+
 set(QtSvg_deps QtGui)
 
 create_pyside_module(NAME QtSvg
diff --git a/sources/pyside6/PySide6/QtSvgWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtSvgWidgets/CMakeLists.txt
index 9203ac003..6bd3aedc1 100644
--- a/sources/pyside6/PySide6/QtSvgWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtSvgWidgets/CMakeLists.txt
@@ -21,16 +21,10 @@ set(QtSvgWidgets_include_dirs ${QtSvgWidgets_SOURCE_DIR}
                               ${QtCore_GEN_DIR}
                               ${QtGui_GEN_DIR}
                               ${QtWidgets_GEN_DIR}
-                              ${QtSvg_GEN_DIR}
-                              )
+                              ${QtSvg_GEN_DIR})
 
 set(QtSvgWidgets_libraries pyside6
-                           ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                           ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                           ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                           ${Qt${QT_MAJOR_VERSION}Svg_LIBRARIES}
-                           ${Qt${QT_MAJOR_VERSION}SvgWidgets_LIBRARIES}
-                           )
+                           ${Qt${QT_MAJOR_VERSION}SvgWidgets_LIBRARIES})
 
 set(QtSvgWidgets_deps QtSvg QtWidgets)
 
diff --git a/sources/pyside6/PySide6/QtTest/CMakeLists.txt b/sources/pyside6/PySide6/QtTest/CMakeLists.txt
index e04903df9..86bb2a731 100644
--- a/sources/pyside6/PySide6/QtTest/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtTest/CMakeLists.txt
@@ -27,14 +27,15 @@ set(QtTest_include_dirs ${QtTest_SOURCE_DIR}
                         ${libpyside_SOURCE_DIR}
                         ${QtCore_GEN_DIR}
                         ${QtGui_GEN_DIR}
-                        ${QtWidgets_GEN_DIR}
-                        )
+                        ${QtWidgets_GEN_DIR})
+
+# Link to QtGui/QtWidgets to enable gui/widget-specific inline functions
 set(QtTest_libraries    pyside6
                         ${Qt${QT_MAJOR_VERSION}Test_LIBRARIES}
                         ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
                         ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                        )
+                        ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES})
+
 set(QtTest_deps  QtWidgets)
 
 create_pyside_module(NAME QtTest
diff --git a/sources/pyside6/PySide6/QtTextToSpeech/CMakeLists.txt b/sources/pyside6/PySide6/QtTextToSpeech/CMakeLists.txt
index 7f8db54b0..9f0bd2fc3 100644
--- a/sources/pyside6/PySide6/QtTextToSpeech/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtTextToSpeech/CMakeLists.txt
@@ -19,9 +19,7 @@ set(QtTextToSpeech_include_dirs ${QtTextToSpeech_SOURCE_DIR}
                                 ${QtCore_GEN_DIR})
 
 set(QtTextToSpeech_libraries    pyside6
-                                ${Qt${QT_MAJOR_VERSION}Multimedia_LIBRARIES}
-                                ${Qt${QT_MAJOR_VERSION}TextToSpeech_LIBRARIES}
-                                ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES})
+                                ${Qt${QT_MAJOR_VERSION}TextToSpeech_LIBRARIES})
 
 set(QtTextToSpeech_deps QtCore QtMultimedia)
 
diff --git a/sources/pyside6/PySide6/QtUiTools/CMakeLists.txt b/sources/pyside6/PySide6/QtUiTools/CMakeLists.txt
index b7385b873..e16d2d585 100644
--- a/sources/pyside6/PySide6/QtUiTools/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtUiTools/CMakeLists.txt
@@ -25,15 +25,12 @@ set(QtUiTools_include_dirs  ${QtUiTools_SOURCE_DIR}
                             ${plugins_SOURCE_DIR}
                             ${QtCore_GEN_DIR}
                             ${QtGui_GEN_DIR}
-                            ${QtWidgets_GEN_DIR}
-                            )
+                            ${QtWidgets_GEN_DIR})
+
 set(QtUiTools_libraries     pyside6
                             uiplugin
-                            ${Qt${QT_MAJOR_VERSION}UiTools_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                            )
+                            ${Qt${QT_MAJOR_VERSION}UiTools_LIBRARIES})
+
 set(QtUiTools_deps QtWidgets)
 
 configure_file("${QtUiTools_SOURCE_DIR}/QtUiTools_global.pre.h.in"
diff --git a/sources/pyside6/PySide6/QtWebChannel/CMakeLists.txt b/sources/pyside6/PySide6/QtWebChannel/CMakeLists.txt
index ecb2caf52..4c06edd2f 100644
--- a/sources/pyside6/PySide6/QtWebChannel/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtWebChannel/CMakeLists.txt
@@ -15,12 +15,11 @@ set(QtWebChannel_include_dirs ${QtWebChannel_SOURCE_DIR}
                         ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
                         ${Qt${QT_MAJOR_VERSION}WebChannel_INCLUDE_DIRS}
                         ${libpyside_SOURCE_DIR}
-                        ${QtCore_GEN_DIR}
-                        )
-set(QtWebChannel_libraries    pyside6
-                        ${Qt${QT_MAJOR_VERSION}WebChannel_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                        )
+                        ${QtCore_GEN_DIR})
+
+set(QtWebChannel_libraries pyside6
+                           ${Qt${QT_MAJOR_VERSION}WebChannel_LIBRARIES})
+
 set(QtWebChannel_deps QtCore)
 
 create_pyside_module(NAME QtWebChannel
diff --git a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt
index 951974c66..2aa7d0b9e 100644
--- a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt
@@ -54,17 +54,10 @@ set(QtWebEngineCore_include_dirs
                             ${QtWidgets_GEN_DIR}
                             ${QtNetwork_GEN_DIR}
                             ${QtPrintSupport_GEN_DIR}
-                            ${QtWebChannel_GEN_DIR}
-                            )
+                            ${QtWebChannel_GEN_DIR})
+
 set(QtWebEngineCore_libraries pyside6
-                            ${Qt${QT_MAJOR_VERSION}WebEngineCore_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}PrintSupport_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}WebChannel_LIBRARIES}
-                            )
+                              ${Qt${QT_MAJOR_VERSION}WebEngineCore_LIBRARIES})
 
 set(QtWebEngineCore_deps QtCore QtGui QtNetwork QtPrintSupport QtWebChannel)
 
diff --git a/sources/pyside6/PySide6/QtWebEngineQuick/CMakeLists.txt b/sources/pyside6/PySide6/QtWebEngineQuick/CMakeLists.txt
index 63bc14f40..5aedc1147 100644
--- a/sources/pyside6/PySide6/QtWebEngineQuick/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtWebEngineQuick/CMakeLists.txt
@@ -19,15 +19,10 @@ set(QtWebEngineQuick_include_dirs
                             ${libpyside_SOURCE_DIR}
                             ${QtCore_GEN_DIR}
                             ${QtNetwork_GEN_DIR}
-                            ${QtQml_GEN_DIR}
-                            )
+                            ${QtQml_GEN_DIR})
 
 set(QtWebEngineQuick_libraries pyside6
-                            ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}WebEngineQuick_LIBRARIES}
-                            )
+                               ${Qt${QT_MAJOR_VERSION}WebEngineQuick_LIBRARIES})
 
 set(QtWebEngineQuick_deps QtQml QtNetwork QtCore)
 
diff --git a/sources/pyside6/PySide6/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtWebEngineWidgets/CMakeLists.txt
index de8c41f5f..9da97243c 100644
--- a/sources/pyside6/PySide6/QtWebEngineWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtWebEngineWidgets/CMakeLists.txt
@@ -27,17 +27,10 @@ set(QtWebEngineWidgets_include_dirs
                             ${QtNetwork_GEN_DIR}
                             ${QtWebEngineCore_GEN_DIR}
                             ${QtPrintSupport_GEN_DIR}
-                            ${QtWebChannel_GEN_DIR}
-                            )
-set(QtWebEngineWidgets_libraries      pyside6
-                            ${Qt${QT_MAJOR_VERSION}WebEngineWidgets_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}PrintSupport_LIBRARIES}
-                            ${Qt${QT_MAJOR_VERSION}WebChannel_LIBRARIES}
-                            )
+                            ${QtWebChannel_GEN_DIR})
+
+set(QtWebEngineWidgets_libraries pyside6
+                                 ${Qt${QT_MAJOR_VERSION}WebEngineWidgets_LIBRARIES})
 
 set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtPrintSupport QtWebChannel QtWebEngineCore)
 
diff --git a/sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt b/sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt
index b51b5d10e..5ff07555b 100644
--- a/sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt
@@ -22,13 +22,10 @@ set(QtWebSockets_include_dirs ${QtWebSockets_SOURCE_DIR}
                         ${libpyside_SOURCE_DIR}
                         ${QtCore_GEN_DIR}
                         ${QtWebSockets_GEN_DIR}
-                        ${QtNetwork_GEN_DIR}
-                        )
-set(QtWebSockets_libraries    pyside6
-                        ${Qt${QT_MAJOR_VERSION}WebSockets_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                        )
+                        ${QtNetwork_GEN_DIR})
+
+set(QtWebSockets_libraries pyside6
+                           ${Qt${QT_MAJOR_VERSION}WebSockets_LIBRARIES})
 
 set(QtWebSockets_deps QtNetwork)
 
diff --git a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt
index 0a731030b..1a77181f2 100644
--- a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt
@@ -210,13 +210,11 @@ set(QtWidgets_include_dirs  ${QtWidgets_SOURCE_DIR}
                             ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS}
                             ${libpyside_SOURCE_DIR}
                             ${QtCore_GEN_DIR}
-                            ${QtGui_GEN_DIR}
-                            )
+                            ${QtGui_GEN_DIR})
+
 set(QtWidgets_libraries pyside6
-                        ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
-                        ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
-                        )
+                        ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES})
+
 set(QtWidgets_deps QtGui)
 
 create_pyside_module(NAME QtWidgets