diff options
author | Trond Kjernaasen <trond@trolltech.com> | 2009-03-02 12:17:40 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-23 11:45:25 (GMT) |
commit | dc789e34bd2ff519024af077bebdf09c85e138e0 (patch) | |
tree | b61b46b890a6877900368c21b5b95e4336c64996 /src/gui/image/qpixmapdata_p.h | |
parent | ebaeb25bebdd29651f15b6e53119597633ea854f (diff) | |
download | Qt-dc789e34bd2ff519024af077bebdf09c85e138e0.zip Qt-dc789e34bd2ff519024af077bebdf09c85e138e0.tar.gz Qt-dc789e34bd2ff519024af077bebdf09c85e138e0.tar.bz2 |
Fixes: Crash in QPixmap under X11.
Task: 246446
RevBy: Olivier
AutoTest: tst_qpixmap::test_246446()
Details: The new QX11PixmapData object wasn't referenced (e.g. the ref
count would be 0) after calling setMask() on a 32 bit QPixmap
when Xrender was used.
Diffstat (limited to 'src/gui/image/qpixmapdata_p.h')
-rw-r--r-- | src/gui/image/qpixmapdata_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h index 2e4da40..7296426 100644 --- a/src/gui/image/qpixmapdata_p.h +++ b/src/gui/image/qpixmapdata_p.h @@ -109,6 +109,7 @@ protected: private: friend class QPixmap; friend class QGLContextPrivate; + friend class QX11PixmapData; QAtomicInt ref; int detach_no; |