diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-03-20 17:21:58 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2018-04-09 18:14:47 +0000 |
| commit | b2035d38e8dfdfe2ba8da96df5c1174f01dfbb5b (patch) | |
| tree | 90c5df8d3ef4ea68e9fb472e5c8bc754fda4e4b7 /src/plugins/platforms/xcb/qxcbintegration.cpp | |
| parent | ead3ca4aef8c1e5d3f3beda69031e8c70a3ad292 (diff) | |
xcb: minor cleanups around QT_CONFIG(xcb_xlib)
- Remove unused createVisualInfoForDefaultVisualId() function.
This amends dff3c0f14f3c3a7288c456028d5bec23bee5406a.
- Inline QXcbConnection::xlib_display().
- Don't nest QT_CONFIG(xcb_native_painting) in QT_CONFIG(xcb_xlib).
configure.json already checks for the dependencies, we don't need
to do that again in *.h/*.cpp.
Change-Id: If39912e67ce9baa31faf091bebe120bac5cf6876
Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 471287eb44..143ea799b0 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -65,12 +65,12 @@ #if QT_CONFIG(xcb_xlib) #include <X11/Xlib.h> +#endif #if QT_CONFIG(xcb_native_painting) #include "qxcbnativepainting.h" #include "qpixmap_x11_p.h" #include "qbackingstore_x11_p.h" #endif -#endif #include <qpa/qplatforminputcontextfactory_p.h> #include <private/qgenericunixthemes_p.h> |