diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 19:07:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 19:07:34 (GMT) |
| commit | 4ef9e81c777affd140dbda97645b31b7658c7280 (patch) | |
| tree | bbf07db11604e1c2541cf8abbea6465b729864f0 /src/gui/image/qnativeimage.cpp | |
| parent | 677f1b4af363845189d93bf564ab9ba97eb160e0 (diff) | |
| parent | 45b205692e457bf39a245436b7db0bb03bd27bbd (diff) | |
| download | Qt-4ef9e81c777affd140dbda97645b31b7658c7280.zip Qt-4ef9e81c777affd140dbda97645b31b7658c7280.tar.gz Qt-4ef9e81c777affd140dbda97645b31b7658c7280.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed translucent window rendering on 16 bit X11.
GV: Update issues if drawItems() is overridden and IndirectPainting is used.
More pedantry.
Fix grammar.
Doc: QFutureWatcher: specify that calls to setFuture should happen after the connections
Diffstat (limited to 'src/gui/image/qnativeimage.cpp')
| -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) |