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 /util | |
| 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 'util')
| -rw-r--r-- | util/cmake/helper.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 0c381a1cd9..8a03176f8e 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", |