summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2020-11-26 08:52:18 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-01 13:28:36 +0000
commitc967ed95a720e210dff398624b97810703815874 (patch)
treea76cfcfb9bb06073278e7d9ee6c3aa2cfcd3408c /util
parentfa51e6cf807adb725a4163769dc8a4750a14d4bc (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 Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 92a57e0b016f811876ec1d62328ca8edfe452a3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util')
-rw-r--r--util/cmake/helper.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index 364e8918ec..66426f9e50 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -526,13 +526,6 @@ _library_map = [
resultVariable="XCB_IMAGE",
),
LibraryMapping(
- "xcb_util",
- "XCB",
- "XCB::UTIL",
- extra=["0.3.9", "COMPONENTS", "UTIL"],
- resultVariable="XCB_UTIL",
- ),
- LibraryMapping(
"xcb_keysyms",
"XCB",
"XCB::KEYSYMS",