diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake index 196c9662a8d..cd962e86674 100644 --- a/src/gui/.prev_configure.cmake +++ b/src/gui/.prev_configure.cmake @@ -66,14 +66,10 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(XCB 0.3.9 COMPONENTS ICCCM PROVIDED_TARGETS XCB::ICCCM MODULE_NAME gui QMAKE_LIB xcb_icccm) 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 -#include #include #include #include diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 8b239617afc..12b7e555102 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -66,14 +66,10 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(XCB 0.3.9 COMPONENTS ICCCM PROVIDED_TARGETS XCB::ICCCM MODULE_NAME gui QMAKE_LIB xcb_icccm) 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 -#include #include #include #include diff --git a/src/gui/configure.json b/src/gui/configure.json index 31a9412bad8..d5816c59683 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", diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 0c381a1cd92..8a03176f8e8 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -525,13 +525,6 @@ _library_map = [ extra=["0.3.9", "COMPONENTS", "IMAGE"], resultVariable="XCB_IMAGE", ), - LibraryMapping( - "xcb_util", - "XCB", - "XCB::UTIL", - extra=["0.3.9", "COMPONENTS", "UTIL"], - resultVariable="XCB_UTIL", - ), LibraryMapping( "xcb_keysyms", "XCB",