summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuchen Deng <loaden@gmail.com>2011-12-30 21:02:17 +0800
committerQt by Nokia <qt-info@nokia.com>2012-01-03 09:35:04 +0100
commitc0542c607bc2ba43ac6dbe3118a4be600ea85c09 (patch)
tree7d021a5f3ae8891f559a3f0e2792470221abd283
parentfda36df6babf20bcfd04a54a1336a9c26e72a8ef (diff)
Build fix if using '-no-stl' configure option
MSVC2010SP1: error C3861: 'wmemcpy': identifier not found Change-Id: Ib28edb5e38d691635c56dac846134e1c88c3f312 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
-rw-r--r--src/plugins/platforms/windows/qwindowsfontdatabase.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index b96ae6f3da..7741aeb9a8 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -51,6 +51,8 @@
#include <QtCore/qmath.h>
#include <QtCore/QDebug>
+#include <wchar.h>
+
#if !defined(QT_NO_DIRECTWRITE)
# include <dwrite.h>
# include <d2d1.h>
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
index 1c4a855255..a7861998b9 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
@@ -51,6 +51,8 @@
#include <QtGui/QGuiApplication>
#include <QtGui/QFontDatabase>
+#include <wchar.h>
+
static inline QFontDatabase::WritingSystem writingSystemFromScript(const QString &scriptName)
{
if (scriptName == QStringLiteral("Western")