6 files changed, 34 insertions, 18 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 019cdef67e..a5b40b56a0 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -12,14 +12,14 @@ set_property(CACHE INPUT_iconv PROPERTY STRINGS undefined no yes posix sun gnu)
 
 qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2)
 qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data)
-qt_find_package(Libsystemd)
+qt_find_package(Libsystemd PROVIDED_TARGETS PkgConfig::Libsystemd)
 qt_find_package(Atomic PROVIDED_TARGETS Atomic)
 qt_find_package(WrapRt PROVIDED_TARGETS WrapRt)
-qt_find_package(LTTngUST)
+qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST)
 qt_find_package(PCRE2 PROVIDED_TARGETS PCRE2)
 set_package_properties(PCRE2 PROPERTIES TYPE REQUIRED)
-qt_find_package(PPS)
-qt_find_package(Slog2)
+qt_find_package(PPS PROVIDED_TARGETS PPS::PPS)
+qt_find_package(Slog2 PROVIDED_TARGETS Slog2::Slog2)
 
 
 #### Tests
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 1ddee1692d..df60f64b49 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -579,7 +579,7 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan
         vulkan/qvulkaninstance.cpp vulkan/qvulkaninstance.h
         vulkan/qvulkanwindow.cpp vulkan/qvulkanwindow.h vulkan/qvulkanwindow_p.h
     PUBLIC_LIBRARIES
-        Vulkan::Vulkan_nolink # special case
+        Vulkan::Vulkan_nolink
 )
 
 # special case:
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 86cce0535a..19f97628c5 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -24,25 +24,40 @@ set_property(CACHE INPUT_xcb PROPERTY STRINGS undefined no yes qt system)
 
 qt_find_package(ATSPI2 PROVIDED_TARGETS PkgConfig::ATSPI2)
 qt_find_package(Libdrm PROVIDED_TARGETS Libdrm::Libdrm)
-qt_find_package(EGL)
+qt_find_package(EGL PROVIDED_TARGETS EGL::EGL)
 qt_find_package(Freetype PROVIDED_TARGETS Freetype::Freetype)
 set_package_properties(Freetype PROPERTIES TYPE REQUIRED)
 qt_find_package(Fontconfig PROVIDED_TARGETS Fontconfig::Fontconfig)
 qt_find_package(gbm PROVIDED_TARGETS gbm::gbm)
 qt_find_package(harfbuzz PROVIDED_TARGETS harfbuzz::harfbuzz)
 qt_find_package(Libinput PROVIDED_TARGETS Libinput::Libinput)
-qt_find_package(JPEG)
+qt_find_package(JPEG PROVIDED_TARGETS JPEG::JPEG)
 qt_find_package(PNG PROVIDED_TARGETS PNG::PNG)
 qt_find_package(Mtdev PROVIDED_TARGETS PkgConfig::Mtdev)
-qt_find_package(OpenGL)
-qt_find_package(GLESv2)
+qt_find_package(OpenGL PROVIDED_TARGETS OpenGL::GL)
+qt_find_package(GLESv2 PROVIDED_TARGETS GLESv2::GLESv2)
 qt_find_package(Tslib PROVIDED_TARGETS PkgConfig::Tslib)
-qt_find_package(Vulkan)
-qt_find_package(Wayland)
-qt_find_package(X11)
+qt_find_package(Vulkan PROVIDED_TARGETS Vulkan::Vulkan)
+qt_find_package(Wayland PROVIDED_TARGETS Wayland::Server)
+qt_find_package(X11 PROVIDED_TARGETS X11::XCB)
+qt_find_package(X11 PROVIDED_TARGETS ${X11_SM_LIB} ${X11_ICE_LIB})
 qt_find_package(XCB 1.9 PROVIDED_TARGETS XCB::XCB)
-qt_find_package(X11_XCB PROVIDED_TARGETS X11::XCB)
+qt_find_package(XCB COMPONENTS ICCCM PROVIDED_TARGETS XCB::ICCCM)
+qt_find_package(XCB COMPONENTS IMAGE PROVIDED_TARGETS XCB::IMAGE)
+qt_find_package(XCB COMPONENTS KEYSYMS PROVIDED_TARGETS XCB::KEYSYMS)
+qt_find_package(XCB COMPONENTS RENDERUTIL PROVIDED_TARGETS XCB::RENDERUTIL)
+qt_find_package(XCB COMPONENTS RANDR PROVIDED_TARGETS XCB::RANDR)
+qt_find_package(XCB COMPONENTS SHAPE PROVIDED_TARGETS XCB::SHAPE)
+qt_find_package(XCB COMPONENTS SHM PROVIDED_TARGETS XCB::SHM)
+qt_find_package(XCB COMPONENTS SYNC PROVIDED_TARGETS XCB::SYNC)
+qt_find_package(XCB COMPONENTS XFIXES PROVIDED_TARGETS XCB::XFIXES)
+qt_find_package(XCB COMPONENTS XINERAMA PROVIDED_TARGETS XCB::XINERAMA)
+qt_find_package(XCB COMPONENTS XKB PROVIDED_TARGETS XCB::XKB)
+qt_find_package(XCB PROVIDED_TARGETS XCB::RENDER)
+qt_find_package(XCB PROVIDED_TARGETS XCB::GLX)
+qt_find_package(XCB COMPONENTS XINPUT PROVIDED_TARGETS XCB::XINPUT)
 qt_find_package(XKB 0.4.1 PROVIDED_TARGETS XKB::XKB)
+qt_find_package(XRender PROVIDED_TARGETS PkgConfig::xrender)
 
 
 #### Tests
@@ -728,7 +743,7 @@ qt_feature("xcb_egl_plugin" PRIVATE
 )
 qt_feature("xcb_native_painting" PRIVATE
     LABEL "Native painting (experimental)"
-    CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_fontconfig AND XCB_RENDER_FOUND
+    CONDITION QT_FEATURE_xcb_xlib AND QT_FEATURE_fontconfig AND XRender_FOUND
     EMIT_IF QT_FEATURE_xcb
 )
 qt_feature("xrender" PRIVATE
@@ -738,7 +753,7 @@ qt_feature("xrender" PRIVATE
 )
 qt_feature("xkb" PRIVATE
     LABEL "XCB XKB"
-    CONDITION ( NOT ON OR XCB_XKB_FOUND ) AND libs.xkbcommon_x11 OR FIXME
+    CONDITION ( NOT ON OR XCB_XKB_FOUND ) AND XKB_FOUND
     EMIT_IF QT_FEATURE_xcb
 )
 qt_feature("xcb_xlib" PRIVATE
diff --git a/src/network/configure.cmake b/src/network/configure.cmake
index c11bcf4744..c7d300acb0 100644
--- a/src/network/configure.cmake
+++ b/src/network/configure.cmake
@@ -7,7 +7,8 @@
 #### Libraries
 
 qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy)
-qt_find_package(OpenSSL)
+qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
+qt_find_package(OpenSSL PROVIDED_TARGETS OpenSSL::SSL)
 
 
 #### Tests
diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake
index 87728099d2..037b361559 100644
--- a/src/plugins/sqldrivers/configure.cmake
+++ b/src/plugins/sqldrivers/configure.cmake
@@ -8,7 +8,7 @@
 
 qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL)
 qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC)
-qt_find_package(SQLite3)
+qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3)
 
 
 #### Tests
diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake
index 50a50f6b05..099414ae39 100644
--- a/src/widgets/configure.cmake
+++ b/src/widgets/configure.cmake
@@ -6,7 +6,7 @@
 
 #### Libraries
 
-qt_find_package(GTK3)
+qt_find_package(GTK3 PROVIDED_TARGETS PkgConfig::GTK3)
 
 
 #### Tests