diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-19 11:59:46 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-19 11:59:46 (GMT) |
| commit | 4d1c2703874b02872a1b54b49dff4140a19d6ed4 (patch) | |
| tree | b3f1e9d3cccd0dc67769da31a7b5509c7cb02733 /src/gui/image/qpixmap_raster_p.h | |
| parent | 226d67e9077b908a128521a6bb763cf412fbe87e (diff) | |
| parent | f16fc0150fce1d78cc71c27c163baf45e8953aca (diff) | |
| download | Qt-4d1c2703874b02872a1b54b49dff4140a19d6ed4.zip Qt-4d1c2703874b02872a1b54b49dff4140a19d6ed4.tar.gz Qt-4d1c2703874b02872a1b54b49dff4140a19d6ed4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/image/qpixmap_raster_p.h')
| -rw-r--r-- | src/gui/image/qpixmap_raster_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index da0405e..1553940 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -68,6 +68,8 @@ public: QRasterPixmapData(PixelType type); ~QRasterPixmapData(); + QPixmapData *createCompatiblePixmapData() const; + void resize(int width, int height); void fromFile(const QString &filename, Qt::ImageConversionFlags flags); void fromImage(const QImage &image, Qt::ImageConversionFlags flags); |