summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2020-09-21 19:16:54 +0200
committerLiang Qi <liang.qi@qt.io>2020-09-22 14:34:37 +0000
commitadc42bebcac764ca8de78578e3a4ac39b621bd09 (patch)
tree438c04b184909b5ea973a0e7f21019323a037b45 /src/gui
parent7b46690801f282a850b872b434292289fb045e61 (diff)
xcb: add xcb-util dependency for xcb-image
xcb-image includes xcb_aux.h, which is part of xcb-util. Fixes: QTBUG-86287 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Change-Id: I253308008c5baeb1d061ef19f516ae6ab6dff52c (adapted from commit 39b1dea2ec5cde9523df61c78dec5d4b195f66d2) Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/configure.json14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 1f08795c57..c8c4864eca 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -601,6 +601,15 @@
],
"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",
@@ -608,7 +617,7 @@
{ "type": "pkgConfig", "args": "xcb-image >= 0.3.9" },
"-lxcb-image"
],
- "use": "xcb_shm xcb"
+ "use": "xcb_shm xcb_util xcb"
},
"xcb_keysyms": {
"label": "XCB Keysyms >= 0.3.9",
@@ -1056,6 +1065,7 @@
"tail": "#undef explicit",
"include": [
"xcb/xcb.h",
+ "xcb/xcb_util.h",
"xcb/xcb_image.h",
"xcb/xcb_keysyms.h",
"xcb/randr.h",
@@ -1087,7 +1097,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_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb"
+ "use": "xcb_icccm xcb_util xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb"
},
"x11prefix": {
"label": "X11 prefix",