OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b9a14fb
)
combine two QT_NO_XRENDER definition checks in qpaintengine_x11 source
author
Ivailo Monev
<xakepa10@gmail.com>
Sun, 2 Aug 2020 06:04:53 +0000
(09:04 +0300)
committer
Ivailo Monev
<xakepa10@gmail.com>
Sun, 2 Aug 2020 06:04:53 +0000
(09:04 +0300)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/painting/qpaintengine_x11.cpp
patch
|
blob
|
history
diff --git
a/src/gui/painting/qpaintengine_x11.cpp
b/src/gui/painting/qpaintengine_x11.cpp
index
9ecae44
..
e3e7535
100644
(file)
--- 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()
{