Changeset 769 for trunk/src/gui/image/qpixmap_s60.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qpixmap_s60.cpp (modified) (2 diffs)

trunk/src/gui/image/qpixmap_s60.cpp

@@ -338 +338 @@
         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());
@@ -736 +736 @@
         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());