diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
| commit | b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7 (patch) | |
| tree | ac169cc9df2ff639e81b15dcaf268ed09d2e16cb /src/gui/image/qpixmap_s60.cpp | |
| parent | 5584feca163e91588f08b0aa1f3ae2817cd90823 (diff) | |
| parent | d7fe798e022884dcbc58844e686a7d4fd39cf027 (diff) | |
| download | Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.zip Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.gz Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/image/qpixmap_s60.cpp')
| -rw-r--r-- | src/gui/image/qpixmap_s60.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp index 326dd10..37b6438 100644 --- a/src/gui/image/qpixmap_s60.cpp +++ b/src/gui/image/qpixmap_s60.cpp @@ -664,7 +664,12 @@ void QS60PixmapData::setAlphaChannel(const QPixmap &alphaChannel) QImage QS60PixmapData::toImage() const { - return image; + QS60PixmapData *that = const_cast<QS60PixmapData*>(this); + that->beginDataAccess(); + QImage copy = that->image.copy(); + that->endDataAccess(); + + return copy; } QPaintEngine* QS60PixmapData::paintEngine() const |