1 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h
index ab144e61ff..dfce2d5b53 100644
--- a/src/gui/image/qicon_p.h
+++ b/src/gui/image/qicon_p.h
@@ -42,29 +42,29 @@ public:
     int serialNum;
     int detach_no;
     bool is_mask;
+
+    static void clearIconCache();
 };
 
 
 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);
 }
@@ -82,7 +82,7 @@ public:
     QList<QSize> availableSizes(QIcon::Mode mode, QIcon::State state) override;
     void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state) override;
     void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state) override;
-
+    bool isNull() override;
 
     QString key() const override;
     QIconEngine *clone() const override;