summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>2011-09-20 11:12:04 -0300
committerZeno Albisser <zeno.albisser@nokia.com>2011-11-03 17:21:11 +0100
commit37cde52cb17b57f8ec89c248f06331ed4977e51c (patch)
tree3d18130253124caec4efe5854151e4fa3a86477d /src/3rdparty/webkit
parent945c44d0865cf44363e6c860995f971ce952dd5f (diff)
Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
Workaround MSVC2010 problems when linking QtWebKit Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/Source/WebCore/WebCore.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
index 82311d2130..00357a1d47 100644
--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
+++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
@@ -303,7 +303,7 @@ win32-* {
}
# Remove whole program optimizations due to miscompilations
-win32-msvc2005|win32-msvc2008|wince*:{
+win32-msvc2005|win32-msvc2008|win32-msvc2010|wince*:{
QMAKE_CFLAGS_RELEASE -= -GL
QMAKE_CXXFLAGS_RELEASE -= -GL