diff options
| author | Peter Hartmann <phartmann@rim.com> | 2012-12-13 15:21:40 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-15 04:43:41 (GMT) |
| commit | a92234fc38a4f32d3c00bcf0adf9b9c54506b8f8 (patch) | |
| tree | 727e7cf909bb52c54eba37a44a6249aedf45c09b | |
| parent | 1566021e623fb79c4ff5475d51010765a3074bbb (diff) | |
| download | Qt-a92234fc38a4f32d3c00bcf0adf9b9c54506b8f8.zip Qt-a92234fc38a4f32d3c00bcf0adf9b9c54506b8f8.tar.gz Qt-a92234fc38a4f32d3c00bcf0adf9b9c54506b8f8.tar.bz2 | |
QPaintEngine: Fix build if compiled with QT_NO_XRENDER
composition_mode is only defined if QT_NO_XRENDER is not defined.
Bug was introduced with 439aa67582e715ddc0ca7e30305b0c9498a71f81
"Fixes ignored composition mode in QPainter::fillRect with X11 engine."
Change-Id: I2dc036ffa277cbf0f9327ede3fead9a407147fc0
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| -rw-r--r-- | src/gui/painting/qpaintengine_x11.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp index eb39893..df04ebb 100644 --- a/src/gui/painting/qpaintengine_x11.cpp +++ b/src/gui/painting/qpaintengine_x11.cpp @@ -777,7 +777,10 @@ void QX11PaintEngine::drawRects(const QRectF *rects, int rectCount) || d->has_complex_xform || d->has_custom_pen || d->cbrush.style() != Qt::SolidPattern - || complexPictOp(d->composition_mode)) +#if !defined(QT_NO_XRENDER) + || complexPictOp(d->composition_mode) +#endif + ) { QPaintEngine::drawRects(rects, rectCount); return; |