summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap_s60.cpp
diff options
context:
space:
mode:
authorDerick Hawcroft <derick.hawcroft@nokia.com>2009-11-23 03:36:20 (GMT)
committerDerick Hawcroft <derick.hawcroft@nokia.com>2009-11-23 03:36:20 (GMT)
commit0cadaf8932355d1fc9cc560d405a3915aeac7d5a (patch)
treef654169a39839dc43a703716fa40fb8d4a63d513 /src/gui/image/qpixmap_s60.cpp
parent0186faea383f3f8223bffd1844e5a47ca22770a5 (diff)
parentc74a5ae953899b9109ef56b2057b094152616480 (diff)
downloadQt-0cadaf8932355d1fc9cc560d405a3915aeac7d5a.zip
Qt-0cadaf8932355d1fc9cc560d405a3915aeac7d5a.tar.gz
Qt-0cadaf8932355d1fc9cc560d405a3915aeac7d5a.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/image/qpixmap_s60.cpp')
-rw-r--r--src/gui/image/qpixmap_s60.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index 17baa50..dc33ade 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -977,4 +977,9 @@ void QS60PixmapData::fromNativeType(void* pixmap, NativeType nativeType)
}
}
+QPixmapData *QS60PixmapData::createCompatiblePixmapData() const
+{
+ return new QS60PixmapData(pixelType());
+}
+
QT_END_NAMESPACE