diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2010-02-24 14:34:49 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2010-02-24 14:52:47 (GMT) |
| commit | 45b205692e457bf39a245436b7db0bb03bd27bbd (patch) | |
| tree | bfc7363cbb3a1049241d43213814b51bab3c1696 | |
| parent | bc3e50ec44fd9ae9a665826a40f325a61087568b (diff) | |
| download | Qt-45b205692e457bf39a245436b7db0bb03bd27bbd.zip Qt-45b205692e457bf39a245436b7db0bb03bd27bbd.tar.gz Qt-45b205692e457bf39a245436b7db0bb03bd27bbd.tar.bz2 | |
Fixed translucent window rendering on 16 bit X11.
Don't assume format is the same as systemFormat() in the QNativeImage
constructor, for translucent windows it's always ARGB32_Premultiplied,
and the depth of the window is always 32 bit.
Reviewed-by: Trond
| -rw-r--r-- | src/gui/image/qnativeimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index 2226901..8446387 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -182,7 +182,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* qWarning() << "Error while marking the shared memory segment to be destroyed"; ok = (xshminfo.shmaddr != (char*)-1); if (ok) - image = QImage((uchar *)xshmimg->data, width, height, systemFormat()); + image = QImage((uchar *)xshmimg->data, width, height, format); } xshminfo.readOnly = false; if (ok) |