diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 17:30:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 17:30:08 (GMT) |
| commit | 0a5bcc8a0ab57becc36b140954b7034b3d11efbc (patch) | |
| tree | 2310a77cf20d10609603c04f7d1bf29e9aec8042 /src/gui/image | |
| parent | 4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (diff) | |
| parent | 83e321747920c31d6fa4c860de3683630fbedb5d (diff) | |
| download | Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.zip Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.tar.gz Qt-0a5bcc8a0ab57becc36b140954b7034b3d11efbc.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap_s60.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp index 4f3a719..a13c8c8 100644 --- a/src/gui/image/qpixmap_s60.cpp +++ b/src/gui/image/qpixmap_s60.cpp @@ -337,7 +337,7 @@ QPixmap QPixmap::fromSymbianCFbsBitmap(CFbsBitmap *bitmap) if (!bitmap) return QPixmap(); - QScopedPointer<QS60PixmapData> data(new QS60PixmapData(QPixmapData::PixmapType)); + QScopedPointer<QPixmapData> data(QPixmapData::create(0,0, QPixmapData::PixmapType)); data->fromNativeType(reinterpret_cast<void*>(bitmap), QPixmapData::FbsBitmap); QPixmap pixmap(data.take()); return pixmap; @@ -735,7 +735,7 @@ QPixmap QPixmap::fromSymbianRSgImage(RSgImage *sgImage) if (!sgImage) return QPixmap(); - QScopedPointer<QS60PixmapData> data(new QS60PixmapData(QPixmapData::PixmapType)); + QScopedPointer<QPixmapData> data(QPixmapData::create(0,0, QPixmapData::PixmapType)); data->fromNativeType(reinterpret_cast<void*>(sgImage), QPixmapData::SgImage); QPixmap pixmap(data.take()); return pixmap; |