summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Pokrzywka <romain@kdab.com>2010-08-16 09:33:38 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2010-09-21 18:23:14 (GMT)
commit44ac0a7ff72c94e7b417da18766ad1578b97b4b0 (patch)
tree86d09d8d875811f99380e2e6f8e68e8b234ed9dd
parentb588e0cbef6b7343307cf38d676d4471f2123cdc (diff)
downloadQt-44ac0a7ff72c94e7b417da18766ad1578b97b4b0.zip
Qt-44ac0a7ff72c94e7b417da18766ad1578b97b4b0.tar.gz
Qt-44ac0a7ff72c94e7b417da18766ad1578b97b4b0.tar.bz2
apply msvc flags to wince too
Reviewed-by: mariusso
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro2
-rw-r--r--src/3rdparty/webkit/WebKit.pri2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 6b21d8a..981dba2 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -104,7 +104,7 @@ freebsd-*: DEFINES += HAVE_PTHREAD_NP_H
DEFINES += BUILD_WEBKIT
# Remove whole program optimizations due to miscompilations
-win32-msvc2005|win32-msvc2008:{
+win32-msvc2005|win32-msvc2008|wince*:{
QMAKE_CFLAGS_RELEASE -= -GL
QMAKE_CXXFLAGS_RELEASE -= -GL
}
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri
index a080c43..bb3fd71 100644
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
@@ -79,5 +79,5 @@ contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
# Disable a few warnings on Windows. The warnings are also
# disabled in WebKitLibraries/win/tools/vsprops/common.vsprops
-win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996
+win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996