diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-09-07 11:32:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-09-21 12:00:12 +0200 |
| commit | 39b1dea2ec5cde9523df61c78dec5d4b195f66d2 (patch) | |
| tree | 18de0f96da4b388b849ec2aa012f1a79aa5d719f /src/gui/configure.cmake | |
| parent | 2a7d6e2779bf0c7915396a8af0e1048d254debc3 (diff) | |
xcb: add xcb-util dependency for xcb-image
xcb-image includes xcb_aux.h, which is part of xcb-util.
Fixes: QTBUG-86287
Pick-to: 5.15
Change-Id: I253308008c5baeb1d061ef19f516ae6ab6dff52c
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, 7 insertions, 1 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index a58ce7c982..24bb8a8582 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -67,9 +67,13 @@ 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) +qt_add_qmake_lib_dependency(xcb_image xcb_shm xcb_util 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() @@ -478,6 +482,7 @@ qt_config_compile_test(xcb_syslibs LABEL "XCB (extensions)" LIBRARIES XCB::ICCCM + XCB::UTIL XCB::IMAGE XCB::KEYSYMS XCB::RANDR @@ -493,6 +498,7 @@ 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> |