diff -r 41300fa6a67c -r f7bc934e204c src/gui/image/qpixmap_s60.cpp --- a/src/gui/image/qpixmap_s60.cpp Tue Feb 02 00:43:10 2010 +0200 +++ b/src/gui/image/qpixmap_s60.cpp Wed Mar 31 11:06:36 2010 +0300 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -337,7 +337,7 @@ if (!bitmap) return QPixmap(); - QScopedPointer data(new QS60PixmapData(QPixmapData::PixmapType)); + QScopedPointer data(QPixmapData::create(0,0, QPixmapData::PixmapType)); data->fromNativeType(reinterpret_cast(bitmap), QPixmapData::FbsBitmap); QPixmap pixmap(data.take()); return pixmap; @@ -735,7 +735,7 @@ if (!sgImage) return QPixmap(); - QScopedPointer data(new QS60PixmapData(QPixmapData::PixmapType)); + QScopedPointer data(QPixmapData::create(0,0, QPixmapData::PixmapType)); data->fromNativeType(reinterpret_cast(sgImage), QPixmapData::SgImage); QPixmap pixmap(data.take()); return pixmap;