diff options
author | Liang Qi <liang.qi@qt.io> | 2020-11-26 08:52:18 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-11-30 22:11:04 +0000 |
commit | 92a57e0b016f811876ec1d62328ca8edfe452a3a (patch) | |
tree | 7fb59f980a51da8eb8945f4b744cf70bcf56287d /src/gui/configure.cmake | |
parent | bf7cec737f9dbb330776aa1d4bf7f130c880e911 (diff) |
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
Pick-to: 5.15 6.0
Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/configure.cmake')
-rw-r--r-- | src/gui/configure.cmake | 8 |
1 files changed, 1 insertions, 7 deletions
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> |