diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 58f34239e4..d8cd47db49 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -103,6 +103,7 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
     qt_find_package(XRender PROVIDED_TARGETS PkgConfig::XRender)
 endif()
 
+
 #### Tests
 
 # angle_d3d11_qdtd
@@ -766,7 +767,7 @@ qt_feature("xcb" PRIVATE
     SECTION "Platform plugins"
     LABEL "XCB"
     AUTODETECT NOT APPLE
-    CONDITION QT_FEATURE_thread AND QT_FEATURE_xkbcommon AND XCB_FOUND
+    CONDITION QT_FEATURE_thread AND QT_FEATURE_xkbcommon AND TARGET XCB::XCB
     ENABLE INPUT_xcb STREQUAL 'system' OR INPUT_xcb STREQUAL 'qt' OR INPUT_xcb STREQUAL 'yes'
 )
 qt_feature("xcb_glx_plugin" PRIVATE
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index e80813a1f7..3be4a505a7 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -229,7 +229,7 @@ _library_map = [
     LibraryMapping('vulkan', 'Vulkan', 'Vulkan::Vulkan'),
     LibraryMapping('wayland_server', 'Wayland', 'Wayland::Server'),
     LibraryMapping('x11sm', 'X11', '${X11_SM_LIB} ${X11_ICE_LIB}', resultVariable="X11_SM"),
-    LibraryMapping('xcb', 'XCB', 'XCB::XCB', extra = ['1.9']),
+    LibraryMapping('xcb', 'XCB', 'XCB::XCB', extra = ['1.9'], resultVariable='TARGET XCB::XCB', appendFoundSuffix=False),
     LibraryMapping('xcb_glx', 'XCB', 'XCB::GLX', extra = ['COMPONENTS', 'GLX'], resultVariable='XCB_GLX'),
     LibraryMapping('xcb_icccm', 'XCB', 'XCB::ICCCM', extra = ['COMPONENTS', 'ICCCM'], resultVariable='XCB_ICCCM'),
     LibraryMapping('xcb_image', 'XCB', 'XCB::IMAGE', extra = ['COMPONENTS', 'IMAGE'], resultVariable='XCB_IMAGE'),