diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2010-02-10 12:26:21 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2010-02-10 12:28:29 (GMT) |
| commit | 0d1e1f26cd9c29e960117e23c57a84055f1cc9e1 (patch) | |
| tree | 4f2bd2e42896ecc7c106e283ad8db21b2118c3c7 /src/gui/painting | |
| parent | f04f014835e9fd4c41e9113e8036ba71ff884ae9 (diff) | |
| download | Qt-0d1e1f26cd9c29e960117e23c57a84055f1cc9e1.zip Qt-0d1e1f26cd9c29e960117e23c57a84055f1cc9e1.tar.gz Qt-0d1e1f26cd9c29e960117e23c57a84055f1cc9e1.tar.bz2 | |
Fixed drawing pixmaps onto bitmaps on X11 w/o Xrender support.
Task-number: QTBUG-8032
Reviewed-by: Kim
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpaintengine_x11.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp index 147491e..da48fcb 100644 --- a/src/gui/painting/qpaintengine_x11.cpp +++ b/src/gui/painting/qpaintengine_x11.cpp @@ -1989,6 +1989,9 @@ void QX11PaintEngine::drawPixmap(const QRectF &r, const QPixmap &px, const QRect } XFillRectangle(d->dpy, d->hd, d->gc, x, y, sw, sh); restore_clip = true; + } else if (mono_dst && !mono_src) { + QBitmap bitmap(pixmap); + XCopyArea(d->dpy, bitmap.handle(), d->hd, d->gc, sx, sy, sw, sh, x, y); } else { XCopyArea(d->dpy, pixmap.handle(), d->hd, d->gc, sx, sy, sw, sh, x, y); } |