From bc0a0281d535079745ed1544a063571b86ca718e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Tue, 12 Jul 2011 09:49:12 +0200
Subject: Get rid of some obsolete functions in QImage / QPixmap / QPixmapData.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/imageformats/ico/qicohandler.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/plugins')

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
-- 
cgit v1.2.3