From: Ivailo Monev <xakepa10@gmail.com>
Date: Sun, 2 Aug 2020 06:04:53 +0000 (+0300)
Subject: combine two QT_NO_XRENDER definition checks in qpaintengine_x11 source
X-Git-Tag: 4.12.0~3639
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01f3d1649ad21c00f62540f0e38d0230f49550b3;p=kde%2FKatie.git

combine two QT_NO_XRENDER definition checks in qpaintengine_x11 source

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index 9ecae44ac..e3e75351b 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -248,10 +248,6 @@ void QXRenderTessellator::addTrap(const Trapezoid &trap)
     ++size;
 }
 
-#endif // !defined(QT_NO_XRENDER)
-
-
-#ifndef QT_NO_XRENDER
 static Picture getPatternFill(int screen, const QBrush &b)
 {
     if (!qt_x11Data->use_xrender)
@@ -319,7 +315,7 @@ static void qt_render_bitmap(Display *dpy, int scrn, Picture src, Picture dst,
     XRenderComposite(dpy, PictOpOver,
                      fill_fg, src, dst, sx, sy, sx, sy, x, y, sw, sh);
 }
-#endif
+#endif // QT_NO_XRENDER
 
 void QX11PaintEnginePrivate::init()
 {