path: root/src/plugins/platforms/xcb/qxcbbackingstore.cpp
diff options
authorGatis Paeglis <>2018-12-27 01:10:29 +0100
committerGatis Paeglis <>2019-01-03 10:09:34 +0000
commit6899117a59256082f37492d81ecaf56a0844690e (patch)
tree8f286d43fdb671952bf61a84cbe9bdb74b99d731 /src/plugins/platforms/xcb/qxcbbackingstore.cpp
parentceddc14af17df166d05d98cfa76256bfc0b34183 (diff)
configure: properly atomize render vs. renderutil
xcb-render is a C interface for X11 extension. xcb-render-util is a utility library that complements xcb-render by providing convenience functions and interfaces which make the raw X protocol more usable. Bumped xcb-render-util version to avoid having include hacks. We were bundling 8 years old release 0.3.8 (Apr, 2011). 0.3.9 is the latest release and it was relesed 4,5 years ago (Jun, 2014). All CI machines have 0.3.9. The only thing that have changed in xcb-render-util sources since 2011 is that we don't need to have various hacks to include xcb_renderutil.h in C++ files. Upgrading bundled XCB libs was also requested in QTBUG-71109. Task-number: QTBUG-71109 Change-Id: Ib261f7584ad81be95660123b007e2200a3042f4c Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbbackingstore.cpp')
1 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
index ba9a3e68ee..e446933dac 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
@@ -47,13 +47,7 @@
#include <xcb/xcb_image.h>
#if QT_CONFIG(xcb_render)
#include <xcb/render.h>
-// 'template' is used as a function argument name in xcb_renderutil.h
-#define template template_param
-// extern "C" is missing too
-extern "C" {
#include <xcb/xcb_renderutil.h>
-#undef template
#include <sys/ipc.h>