Revert "xcb: add xcb-util dependency for xcb-image"

This reverts commit 39b1dea2ec5cde9523df61c78dec5d4b195f66d2.

39b1dea2 is wrong, the bug is for static build of qt with static
xcb. It adds the explicit dependency of xcb-util 0.3.9, which is
not available on Debian yet.

Task-number: QTBUG-86287
Fixes: QTBUG-88688
Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 92a57e0b016f811876ec1d62328ca8edfe452a3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 4 insertions, 26 deletions

diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake
index 196c9662a8..cd962e8667 100644
--- a/src/gui/.prev_configure.cmake
+++ b/src/gui/.prev_configure.cmake
@@ -67,13 +67,9 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
 endif()
 qt_add_qmake_lib_dependency(xcb_icccm xcb)
 if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
-    qt_find_package(XCB 0.3.9 COMPONENTS UTIL PROVIDED_TARGETS XCB::UTIL MODULE_NAME gui QMAKE_LIB xcb_util)
-endif()
-qt_add_qmake_lib_dependency(xcb_util xcb)
-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
     qt_find_package(XCB 0.3.9 COMPONENTS IMAGE PROVIDED_TARGETS XCB::IMAGE MODULE_NAME gui QMAKE_LIB xcb_image)
 endif()
-qt_add_qmake_lib_dependency(xcb_image xcb_shm xcb_util xcb)
+qt_add_qmake_lib_dependency(xcb_image xcb_shm xcb)
 if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
     qt_find_package(XCB 0.3.9 COMPONENTS KEYSYMS PROVIDED_TARGETS XCB::KEYSYMS MODULE_NAME gui QMAKE_LIB xcb_keysyms)
 endif()
@@ -482,7 +478,6 @@ qt_config_compile_test(xcb_syslibs
     LABEL "XCB (extensions)"
     LIBRARIES
         XCB::ICCCM
-        XCB::UTIL
         XCB::IMAGE
         XCB::KEYSYMS
         XCB::RANDR
@@ -498,7 +493,6 @@ qt_config_compile_test(xcb_syslibs
 "// xkb.h is using a variable called 'explicit', which is a reserved keyword in C++
 #define explicit dont_use_cxx_explicit
 #include <xcb/xcb.h>
-#include <xcb/xcb_util.h>
 #include <xcb/xcb_image.h>
 #include <xcb/xcb_keysyms.h>
 #include <xcb/randr.h>
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 8b239617af..12b7e55510 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -67,13 +67,9 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
 endif()
 qt_add_qmake_lib_dependency(xcb_icccm xcb)
 if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
-    qt_find_package(XCB 0.3.9 COMPONENTS UTIL PROVIDED_TARGETS XCB::UTIL MODULE_NAME gui QMAKE_LIB xcb_util)
-endif()
-qt_add_qmake_lib_dependency(xcb_util xcb)
-if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
     qt_find_package(XCB 0.3.9 COMPONENTS IMAGE PROVIDED_TARGETS XCB::IMAGE MODULE_NAME gui QMAKE_LIB xcb_image)
 endif()
-qt_add_qmake_lib_dependency(xcb_image xcb_shm xcb_util xcb)
+qt_add_qmake_lib_dependency(xcb_image xcb_shm xcb)
 if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS)
     qt_find_package(XCB 0.3.9 COMPONENTS KEYSYMS PROVIDED_TARGETS XCB::KEYSYMS MODULE_NAME gui QMAKE_LIB xcb_keysyms)
 endif()
@@ -484,7 +480,6 @@ qt_config_compile_test(xcb_syslibs
     LABEL "XCB (extensions)"
     LIBRARIES
         XCB::ICCCM
-        XCB::UTIL
         XCB::IMAGE
         XCB::KEYSYMS
         XCB::RANDR
@@ -500,7 +495,6 @@ qt_config_compile_test(xcb_syslibs
 "// xkb.h is using a variable called 'explicit', which is a reserved keyword in C++
 #define explicit dont_use_cxx_explicit
 #include <xcb/xcb.h>
-#include <xcb/xcb_util.h>
 #include <xcb/xcb_image.h>
 #include <xcb/xcb_keysyms.h>
 #include <xcb/randr.h>
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 31a9412bad..d5816c5968 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -526,15 +526,6 @@
             ],
             "use": "xcb"
         },
-        "xcb_util": {
-            "label": "XCB Util >= 0.3.9",
-            "headers": "xcb/xcb_util.h",
-            "sources": [
-                { "type": "pkgConfig", "args": "xcb-util >= 0.3.9" },
-                "-lxcb-util"
-            ],
-            "use": "xcb"
-        },
         "xcb_image": {
             "label": "XCB Image >= 0.3.9",
             "headers": "xcb/xcb_image.h",
@@ -542,7 +533,7 @@
                 { "type": "pkgConfig", "args": "xcb-image >= 0.3.9" },
                 "-lxcb-image"
             ],
-            "use": "xcb_shm xcb_util xcb"
+            "use": "xcb_shm xcb"
         },
         "xcb_keysyms": {
             "label": "XCB Keysyms >= 0.3.9",
@@ -965,7 +956,6 @@
                 "tail": "#undef explicit",
                 "include": [
                     "xcb/xcb.h",
-                    "xcb/xcb_util.h",
                     "xcb/xcb_image.h",
                     "xcb/xcb_keysyms.h",
                     "xcb/randr.h",
@@ -996,7 +986,7 @@
                     "xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);"
                 ]
             },
-            "use": "xcb_icccm xcb_util xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xkb xcb"
+            "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xkb xcb"
         },
         "x11prefix": {
             "label": "X11 prefix",