Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

3 files changed, 34 insertions, 31 deletions

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index c1a8cfaa1e..0a4b50bbea 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -43,6 +43,7 @@
 #include "qicon_p.h"
 #include "qiconengine.h"
 #include "qiconengineplugin.h"
+#include "qimagereader.h"
 #include "private/qfactoryloader_p.h"
 #include "private/qiconloader_p.h"
 #include "qpainter.h"
@@ -365,37 +366,40 @@ void QPixmapIconEngine::addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon
 void QPixmapIconEngine::addFile(const QString &fileName, const QSize &_size, QIcon::Mode mode, QIcon::State state)
 {
     if (!fileName.isEmpty()) {
-        QSize size = _size;
-        QPixmap pixmap;
-
         QString abs = fileName;
         if (fileName.at(0) != QLatin1Char(':'))
             abs = QFileInfo(fileName).absoluteFilePath();
-
-        for (int i = 0; i < pixmaps.count(); ++i) {
-            if (pixmaps.at(i).mode == mode && pixmaps.at(i).state == state) {
-                QPixmapIconEngineEntry *pe = &pixmaps[i];
-                if(size == QSize()) {
-                    pixmap = QPixmap(abs);
-                    size = pixmap.size();
-                }
-                if (pe->size == QSize() && pe->pixmap.isNull()) {
-                    pe->pixmap = QPixmap(pe->fileName);
-                    // Reset the devicePixelRatio. The pixmap may be loaded from a @2x file,
-                    // but be used as a 1x pixmap by QIcon.
-                    pe->pixmap.setDevicePixelRatio(1.0);
-                    pe->size = pe->pixmap.size();
-                }
-                if(pe->size == size) {
-                    pe->pixmap = pixmap;
-                    pe->fileName = abs;
-                    return;
+        QImageReader reader(abs);
+
+        do {
+            QSize size = _size;
+            QPixmap pixmap;
+
+            for (int i = 0; i < pixmaps.count(); ++i) {
+                if (pixmaps.at(i).mode == mode && pixmaps.at(i).state == state) {
+                    QPixmapIconEngineEntry *pe = &pixmaps[i];
+                    if (size == QSize()) {
+                        pixmap.convertFromImage(reader.read());
+                        size = pixmap.size();
+                    }
+                    if (pe->size == QSize() && pe->pixmap.isNull()) {
+                        pe->pixmap = QPixmap(pe->fileName);
+                        // Reset the devicePixelRatio. The pixmap may be loaded from a @2x file,
+                        // but be used as a 1x pixmap by QIcon.
+                        pe->pixmap.setDevicePixelRatio(1.0);
+                        pe->size = pe->pixmap.size();
+                    }
+                    if (pe->size == size) {
+                        pe->pixmap = pixmap;
+                        pe->fileName = abs;
+                        return;
+                    }
                 }
             }
-        }
-        QPixmapIconEngineEntry e(abs, size, mode, state);
-        e.pixmap = pixmap;
-        pixmaps += e;
+            QPixmapIconEngineEntry e(abs, size, mode, state);
+            e.pixmap = pixmap;
+            pixmaps += e;
+        } while (reader.jumpToNextImage());
     }
 }
 
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index d202d62957..9e979023cd 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -519,10 +519,11 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st
         return cachedPixmap;
     } else {
         if (basePixmap.size() != actualSize)
-            basePixmap = basePixmap.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-        cachedPixmap = basePixmap;
+            cachedPixmap = basePixmap.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        else
+            cachedPixmap = basePixmap;
         if (QGuiApplication *guiApp = qobject_cast<QGuiApplication *>(qApp))
-            cachedPixmap = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(guiApp))->applyQIconStyleHelper(mode, basePixmap);
+            cachedPixmap = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(guiApp))->applyQIconStyleHelper(mode, cachedPixmap);
         QPixmapCache::insert(key, cachedPixmap);
     }
     return cachedPixmap;
diff --git a/src/gui/image/qpictureformatplugin.cpp b/src/gui/image/qpictureformatplugin.cpp
index c87b9ba6ac..69c3d9ccec 100644
--- a/src/gui/image/qpictureformatplugin.cpp
+++ b/src/gui/image/qpictureformatplugin.cpp
@@ -79,8 +79,6 @@ QT_BEGIN_NAMESPACE
 
     Installs a QPictureIO picture I/O handler for the picture format \a
     format. Returns \c true on success.
-
-    \sa keys()
 */