1 files changed, 4 insertions, 11 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 6674717..2c2418c 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -49,7 +49,7 @@
 #include "qregexp.h"
 #include "qdebug.h"
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
-#include <windows.h>
+#include <qt_windows.h>
 #endif
 #ifndef Q_WS_WIN
 #include <locale.h>
@@ -2503,16 +2503,9 @@ QString QDateTime::toString(Qt::DateFormat f) const
         buf += QLatin1Char(' ');
         buf += QString::number(d->date.day());
 #else
-        QString winstr;
-        QT_WA({
-            TCHAR out[255];
-            GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILDATE, out, 255);
-            winstr = QString::fromUtf16((ushort*)out);
-        } , {
-            char out[255];
-            GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_ILDATE, (char*)&out, 255);
-            winstr = QString::fromLocal8Bit(out);
-        });
+        wchar_t out[255];
+        GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILDATE, out, 255);
+        QString winstr = QString::fromWCharArray(out);
         switch (winstr.toInt()) {
         case 1:
             buf = d->date.shortDayName(d->date.dayOfWeek());