diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-11-01 15:29:35 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-11-30 14:05:13 +0000 |
| commit | f2b4462f84d0b8b28da50141163890bbf7fe6174 (patch) | |
| tree | 89e007a7aaf5a883def5e0bff31653a768d539b5 /src/gui/configure.json | |
| parent | 0de4b326d8e02c228ebefcac1abe069c45cbb5c4 (diff) | |
xcb: remove old work-around for building with util-wm
Commits that added this code:
7ce8491280990350162933a0716d1b014f65aeb6 and
f005dee1b3692a09e47782dcff9b5b07aa659b51
I guess this was a work-around, before we started bundling
XCB libs a year later in 21bd66e1ea06e466754ab06ee2c5f8b737bb4bd7
0.3.8 was released in 2011-04-26 and we are bundling 0.3.9, so
it is safe to remove the include work-around as well.
Change-Id: I5794f40d86e10ebdad984aa4b61311979aaadcf3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 590e52d258..25ff553876 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -484,13 +484,8 @@ "xcb/xinerama.h", "xcb/sync.h", "xcb/randr.h", - "xcb/shm.h" - ], - "tail": [ - "// This workaround can be removed for xcb-icccm > 3.8", - "#define class class_name", - "#include <xcb/xcb_icccm.h>", - "#undef class" + "xcb/shm.h", + "xcb/xcb_icccm.h" ], "main": [ "int primaryScreen = 0;", |