summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-msvc2010
diff options
context:
space:
mode:
authorliang jian <jianliang79@gmail.com>2010-07-08 10:56:03 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-08 10:57:53 (GMT)
commita9c8decc741d8c2b340f38d7a854ef206672ab3e (patch)
treee1af5c553ba2a44519e6add265755d5abdebaf0f /mkspecs/win32-msvc2010
parentbd576d42be264ff60503db0da509ad16139de09f (diff)
downloadQt-a9c8decc741d8c2b340f38d7a854ef206672ab3e.zip
Qt-a9c8decc741d8c2b340f38d7a854ef206672ab3e.tar.gz
Qt-a9c8decc741d8c2b340f38d7a854ef206672ab3e.tar.bz2
Build Qt with option -Zc:wchar_t under MSVC
This will make projects generated by visual studio being successfully linked to the Qt dlls if they use the QString::fromWCharArray() or QString::toWCharArray() methods. Merge-request: 727 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/win32-msvc2010')
-rw-r--r--mkspecs/win32-msvc2010/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 28d4d3c..34a7782 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -16,7 +16,7 @@ QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = byacc
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t-
+QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t
QMAKE_CFLAGS_WARN_ON = -W3
QMAKE_CFLAGS_WARN_OFF = -W0
QMAKE_CFLAGS_RELEASE = -O2 -MD