diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-10-02 11:11:13 (GMT) |
|---|---|---|
| committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2009-10-02 11:16:43 (GMT) |
| commit | df72e57ffd316cce32d6ca208f6ba636d8b5bde5 (patch) | |
| tree | cd658bc3a021e8e4920a50d6458d20541e3bd5a7 /src/3rdparty/javascriptcore | |
| parent | 77439ac992bd9db2845ab3a05b32d2b3ea5dc26c (diff) | |
| download | Qt-df72e57ffd316cce32d6ca208f6ba636d8b5bde5.zip Qt-df72e57ffd316cce32d6ca208f6ba636d8b5bde5.tar.gz Qt-df72e57ffd316cce32d6ca208f6ba636d8b5bde5.tar.bz2 | |
Fix compiler warnings on VS2008
Disabled C4396 for both webit and javascript core projects. Fixed some
C4100 (unreferenced formal parameter) warnings in Qt code.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/javascriptcore')
| -rw-r--r-- | src/3rdparty/javascriptcore/WebKit.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index ded4701..fd918c9 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -48,7 +48,7 @@ symbian|*-armcc { RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293 RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates DEFINES *= QT_NO_UITOOLS -} +} *-armcc { QMAKE_CFLAGS += $$RVCT_COMMON_CFLAGS @@ -63,7 +63,7 @@ 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 -wd4503 -wd4800 -wd4819 -wd4996 +win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996 # # For builds inside Qt we interpret the output rule and the input of each extra compiler manually |