diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-11-19 16:52:51 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-11-19 16:52:51 (GMT) |
| commit | 5f5e1b7aa5d03203346e00751b8bf15883944b25 (patch) | |
| tree | 3249e917ea4ab58d38d0f78bad2db8d912c31942 /src/gui/image | |
| parent | 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa (diff) | |
| download | Qt-5f5e1b7aa5d03203346e00751b8bf15883944b25.zip Qt-5f5e1b7aa5d03203346e00751b8bf15883944b25.tar.gz Qt-5f5e1b7aa5d03203346e00751b8bf15883944b25.tar.bz2 | |
Fix crash when using splash screen, or QPixmap::copy()
Missing virtual function now implemented
Task-number: QTBUG-5977
Reviewed-by: axis
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qpixmap_s60.cpp | 5 | ||||
| -rw-r--r-- | src/gui/image/qpixmap_s60_p.h | 2 |
2 files changed, 7 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 diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h index b1b5824..8631ebd 100644 --- a/src/gui/image/qpixmap_s60_p.h +++ b/src/gui/image/qpixmap_s60_p.h @@ -87,6 +87,8 @@ public: QS60PixmapData(PixelType type); ~QS60PixmapData(); + QPixmapData *createCompatiblePixmapData() const; + void resize(int width, int height); void fromImage(const QImage &image, Qt::ImageConversionFlags flags); void copy(const QPixmapData *data, const QRect &rect); |