3 files changed, 15 insertions, 9 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index c09f9d22e4..745f6548b5 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -66,6 +66,8 @@
 #include <QtCore/QMutexLocker>
 #include <QtCore/private/qsystemlibrary_p.h>
 
+#include <algorithm>
+
 #include "qtwindows_additional.h"
 
 #define STRICT_TYPED_ITEMIDS
@@ -1961,7 +1963,7 @@ private:
 QWindowsNativeColorDialog::QWindowsNativeColorDialog(const SharedPointerColor &color) :
     m_code(QPlatformDialogHelper::Rejected), m_color(color)
 {
-    qFill(m_customColors, m_customColors + 16, COLORREF(0));
+    std::fill(m_customColors, m_customColors + 16, COLORREF(0));
 }
 
 void QWindowsNativeColorDialog::exec(HWND owner)
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp
index f6dda04c13..d1ede39549 100644
--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp
@@ -49,6 +49,8 @@
 #include <QtGui/QGuiApplication>
 #include <qpa/qplatformnativeinterface.h>
 
+#include <algorithm>
+
 #include <wingdi.h>
 #include <GL/gl.h>
 
@@ -377,7 +379,7 @@ static int choosePixelFormat(HDC hdc,
         return 0;
 
     int iAttributes[attribSize];
-    qFill(iAttributes, iAttributes + attribSize, int(0));
+    std::fill(iAttributes, iAttributes + attribSize, int(0));
     int i = 0;
     iAttributes[i++] = WGL_ACCELERATION_ARB;
     iAttributes[i++] = testFlag(additional.formatFlags, QWindowsGLDirectRendering) ?
@@ -505,8 +507,8 @@ static QSurfaceFormat
         return result;
     int iAttributes[attribSize];
     int iValues[attribSize];
-    qFill(iAttributes, iAttributes + attribSize, int(0));
-    qFill(iValues, iValues + attribSize, int(0));
+    std::fill(iAttributes, iAttributes + attribSize, int(0));
+    std::fill(iValues, iValues + attribSize, int(0));
 
     int i = 0;
     const bool hasSampleBuffers = testFlag(staticContext.extensions, QOpenGLStaticContext::SampleBuffers);
@@ -567,7 +569,7 @@ static HGLRC createContext(const QOpenGLStaticContext &staticContext,
         return 0;
     int attributes[attribSize];
     int attribIndex = 0;
-    qFill(attributes, attributes + attribSize, int(0));
+    std::fill(attributes, attributes + attribSize, int(0));
 
     // We limit the requested version by the version of the static context as
     // wglCreateContextAttribsARB fails and returns NULL if the requested context
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
index 724ea00340..1710fd419a 100644
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
@@ -63,6 +63,8 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <private/qsystemlibrary_p.h>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 static inline QTextStream& operator<<(QTextStream &str, const QColor &c)
@@ -284,8 +286,8 @@ QWindowsTheme *QWindowsTheme::m_instance = 0;
 QWindowsTheme::QWindowsTheme()
 {
     m_instance = this;
-    qFill(m_fonts, m_fonts + NFonts, static_cast<QFont *>(0));
-    qFill(m_palettes, m_palettes + NPalettes, static_cast<QPalette *>(0));
+    std::fill(m_fonts, m_fonts + NFonts, static_cast<QFont *>(0));
+    std::fill(m_palettes, m_palettes + NPalettes, static_cast<QPalette *>(0));
     refresh();
 }
 
@@ -368,7 +370,7 @@ QVariant QWindowsTheme::themeHint(ThemeHint hint) const
 void QWindowsTheme::clearPalettes()
 {
     qDeleteAll(m_palettes, m_palettes + NPalettes);
-    qFill(m_palettes, m_palettes + NPalettes, static_cast<QPalette *>(0));
+    std::fill(m_palettes, m_palettes + NPalettes, static_cast<QPalette *>(0));
 }
 
 void QWindowsTheme::refreshPalettes()
@@ -389,7 +391,7 @@ void QWindowsTheme::refreshPalettes()
 void QWindowsTheme::clearFonts()
 {
     qDeleteAll(m_fonts, m_fonts + NFonts);
-    qFill(m_fonts, m_fonts + NFonts, static_cast<QFont *>(0));
+    std::fill(m_fonts, m_fonts + NFonts, static_cast<QFont *>(0));
 }
 
 void QWindowsTheme::refreshFonts()