diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-17 00:21:54 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-17 00:21:54 (GMT) |
| commit | 987aec28b950e1c9817a20a9dd71afc071cd93ea (patch) | |
| tree | e3ae207dc5793947325a1deaebab76c3de959192 /src/3rdparty/webkit | |
| parent | 5344f4cb267e35cd112aea6f445f1046a5ac0a9c (diff) | |
| parent | e1c019fd7ecaa59eee39f23434dd63d5656f4ee0 (diff) | |
| download | Qt-987aec28b950e1c9817a20a9dd71afc071cd93ea.zip Qt-987aec28b950e1c9817a20a9dd71afc071cd93ea.tar.gz Qt-987aec28b950e1c9817a20a9dd71afc071cd93ea.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index b76cad1..b0b0290 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -41,7 +41,7 @@ CONFIG -= warn_on # Disable a few warnings on Windows. The warnings are also # disabled in WebKitLibraries/win/tools/vsprops/common.vsprops -win32-*: QMAKE_CXXFLAGS += -wd4291 -wd4344 +!win32-g++:win32-*: QMAKE_CXXFLAGS += -wd4291 -wd4344 unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections |