diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:02:21 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 16:02:21 (GMT) |
| commit | e658bcb0e64acca9684f0897510d639af98ab552 (patch) | |
| tree | 5f2f155093238f0b6e808bc0d6cb54b3bf0b6c4f /src/3rdparty/webkit/WebKit.pri | |
| parent | bb35c5aaa2ad80eaa7f88df6d83945adbf9bde92 (diff) | |
| parent | 1ffaf40f5cffca57d7e116d61935ccd034239222 (diff) | |
| download | Qt-e658bcb0e64acca9684f0897510d639af98ab552.zip Qt-e658bcb0e64acca9684f0897510d639af98ab552.tar.gz Qt-e658bcb0e64acca9684f0897510d639af98ab552.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/WebKit.pri')
| -rw-r--r-- | src/3rdparty/webkit/WebKit.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index ded4701..fd918c9 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/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 |