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.json | |
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.json')
-rw-r--r-- | src/gui/configure.json | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index d5816c5968..31a9412bad 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -526,6 +526,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", @@ -533,7 +542,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", @@ -956,6 +965,7 @@ "tail": "#undef explicit", "include": [ "xcb/xcb.h", + "xcb/xcb_util.h", "xcb/xcb_image.h", "xcb/xcb_keysyms.h", "xcb/randr.h", @@ -986,7 +996,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_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_xkb xcb" }, "x11prefix": { "label": "X11 prefix", |