Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	qmake/library/qmakeevaluator.cpp

One side changed the iterator to use ranged-for, the other changed its
body; they only conflicted because the latter had to add braces around
the body, intruding on the for-line.  Trivial resolution.

Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b

1 files changed, 5 insertions, 0 deletions

diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h
index acf89306c2..fa1fb4d998 100644
--- a/src/plugins/platforms/windows/qwindowstheme.h
+++ b/src/plugins/platforms/windows/qwindowstheme.h
@@ -43,6 +43,8 @@
 #include "qwindowsthreadpoolrunner.h"
 #include <qpa/qplatformtheme.h>
 
+#include <QtCore/QVariant>
+
 QT_BEGIN_NAMESPACE
 
 class QWindow;
@@ -68,6 +70,7 @@ public:
                            QPlatformTheme::IconOptions iconOptions = 0) const Q_DECL_OVERRIDE;
 
     void windowsThemeChanged(QWindow *window);
+    void displayChanged() { refreshIconPixmapSizes(); }
 
     static const char *name;
 
@@ -77,11 +80,13 @@ private:
     void refreshPalettes();
     void clearFonts();
     void refreshFonts();
+    void refreshIconPixmapSizes();
 
     static QWindowsTheme *m_instance;
     QPalette *m_palettes[NPalettes];
     QFont *m_fonts[NFonts];
     mutable QWindowsThreadPoolRunner m_threadPoolRunner;
+    QVariant m_fileIconSizes;
 };
 
 QT_END_NAMESPACE