diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-17 12:37:56 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-17 12:37:56 (GMT) |
| commit | c950a2594f7c3102930541800edac5384827846d (patch) | |
| tree | ffd520c7e46a1e1adda21ade80d381893e13ad46 /src/gui | |
| parent | e1915815bc5ef86b3844608bba46769da5173363 (diff) | |
| parent | f95d1dbd840c4959085ec44d24409ba134a05cd0 (diff) | |
| download | Qt-c950a2594f7c3102930541800edac5384827846d.zip Qt-c950a2594f7c3102930541800edac5384827846d.tar.gz Qt-c950a2594f7c3102930541800edac5384827846d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui')
| -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; |