1 files changed, 27 insertions, 12 deletions

diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h
index c5bf120620..8050d76435 100644
--- a/src/gui/image/qicon_p.h
+++ b/src/gui/image/qicon_p.h
@@ -34,7 +34,7 @@ public:
         delete engine;
     }
 
-    qreal pixmapDevicePixelRatio(qreal displayDevicePixelRatio, const QSize &requestedSize, const QSize &actualSize);
+    static qreal pixmapDevicePixelRatio(qreal displayDevicePixelRatio, const QSize &requestedSize, const QSize &actualSize);
 
     QIconEngine *engine;
 
@@ -49,24 +49,22 @@ public:
 
 struct QPixmapIconEngineEntry
 {
-    QPixmapIconEngineEntry():scale(1), mode(QIcon::Normal), state(QIcon::Off){}
-    QPixmapIconEngineEntry(const QPixmap &pm, QIcon::Mode m = QIcon::Normal, QIcon::State s = QIcon::Off)
-        :pixmap(pm), size(pm.size()), scale(pm.devicePixelRatio()), mode(m), state(s){}
-    QPixmapIconEngineEntry(const QString &file, const QSize &sz = QSize(), QIcon::Mode m = QIcon::Normal, QIcon::State s = QIcon::Off)
-        :fileName(file), size(sz), scale(1), mode(m), state(s){}
-    QPixmapIconEngineEntry(const QString &file, const QImage &image, QIcon::Mode m = QIcon::Normal, QIcon::State s = QIcon::Off);
+    QPixmapIconEngineEntry() = default;
+    QPixmapIconEngineEntry(const QPixmap &pm, QIcon::Mode m, QIcon::State s)
+        : pixmap(pm), size(pm.size()), mode(m), state(s) {}
+    QPixmapIconEngineEntry(const QString &file, const QSize &sz, QIcon::Mode m, QIcon::State s)
+        : fileName(file), size(sz), mode(m), state(s) {}
+    QPixmapIconEngineEntry(const QString &file, const QImage &image, QIcon::Mode m, QIcon::State s);
     QPixmap pixmap;
     QString fileName;
     QSize size;
-    qreal scale;
-    QIcon::Mode mode;
-    QIcon::State state;
-    bool isNull() const {return (fileName.isEmpty() && pixmap.isNull()); }
+    QIcon::Mode mode = QIcon::Normal;
+    QIcon::State state = QIcon::Off;
 };
 Q_DECLARE_TYPEINFO(QPixmapIconEngineEntry, Q_RELOCATABLE_TYPE);
 
 inline QPixmapIconEngineEntry::QPixmapIconEngineEntry(const QString &file, const QImage &image, QIcon::Mode m, QIcon::State s)
-    : fileName(file), size(image.size()), scale(image.devicePixelRatio()), mode(m), state(s)
+    : fileName(file), size(image.size()), mode(m), state(s)
 {
     pixmap.convertFromImage(image);
 }
@@ -91,7 +89,24 @@ public:
     bool read(QDataStream &in) override;
     bool write(QDataStream &out) const override;
 
+    static inline QSize adjustSize(const QSize &expectedSize, QSize size)
+    {
+        if (!size.isNull() && (size.width() > expectedSize.width() || size.height() > expectedSize.height()))
+            size.scale(expectedSize, Qt::KeepAspectRatio);
+        return size;
+    }
+
 private:
+    void removePixmapEntry(QPixmapIconEngineEntry *pe)
+    {
+        auto idx = pixmaps.size();
+        while (--idx >= 0) {
+            if (pe == &pixmaps.at(idx)) {
+                pixmaps.remove(idx);
+                return;
+            }
+        }
+    }
     QPixmapIconEngineEntry *tryMatch(const QSize &size, qreal scale, QIcon::Mode mode, QIcon::State state);
     QList<QPixmapIconEngineEntry> pixmaps;