diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:52:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:25 +0200 |
| commit | 7f269a5db8b88fbb14ee741f78e726b1a46c7d4d (patch) | |
| tree | fa63387e6f70187e656dd9e6c4f1cd1b1f96c263 /src/plugins/platforms/xcb/qxcbimage.cpp | |
| parent | 9ca3443a37284bedaf74475c26af173b00757178 (diff) | |
| parent | 03b4838cb51513bd5d2edf76dccc4bc4a1181681 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbimage.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbimage.cpp b/src/plugins/platforms/xcb/qxcbimage.cpp index 67a959d8a4..f3dfa1916b 100644 --- a/src/plugins/platforms/xcb/qxcbimage.cpp +++ b/src/plugins/platforms/xcb/qxcbimage.cpp @@ -41,7 +41,7 @@ #include <QtGui/QColor> #include <QtGui/private/qimage_p.h> #include <QtGui/private/qdrawhelper_p.h> -#ifdef XCB_USE_RENDER +#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 @@ -193,7 +193,7 @@ xcb_pixmap_t qt_xcb_XPixmapFromBitmap(QXcbScreen *screen, const QImage &image) xcb_cursor_t qt_xcb_createCursorXRender(QXcbScreen *screen, const QImage &image, const QPoint &spot) { -#ifdef XCB_USE_RENDER +#if QT_CONFIG(xcb_render) xcb_connection_t *conn = screen->xcb_connection(); const int w = image.width(); const int h = image.height(); |