diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 09:49:12 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-07-18 10:50:12 +0200 |
commit | bc0a0281d535079745ed1544a063571b86ca718e (patch) | |
tree | 8994e4f02518ebb4acc6d4672c942aa276752295 /src/plugins/imageformats | |
parent | a81093b9150b2f1727de6e9e77b8bdddb1c909ee (diff) |
Get rid of some obsolete functions in QImage / QPixmap / QPixmapData.
Change-Id: I0d2412c9196475b926a17de9fcc3281f6625fae0
Reviewed-on: http://codereview.qt.nokia.com/1733
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins/imageformats')
-rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 5e1f16bad4..da6b8a75bc 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -589,7 +589,6 @@ QImage ICOReader::iconAt(int index) mask.setColor(1, qRgba(0 ,0 ,0 ,0xff)); read1BitBMP(mask); if (!mask.isNull()) { - img = QImage(image.width(), image.height(), QImage::Format_ARGB32 ); img = image; img.setAlphaChannel(mask); // (Luckily, it seems that setAlphaChannel() does not ruin the alpha values |