summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>2011-09-20 14:12:04 (GMT)
committerAdemar de Souza Reis Jr <ademar.reis@openbossa.org>2011-09-20 14:16:27 (GMT)
commit3489808c1dcd157ac09dd6da16bc057b56696d59 (patch)
treeb76adb43ade07d6a9e136ac07ba824b607dd12b3
parent3dd9e66baaa0848bcc2eb7daecf2b63724624358 (diff)
downloadQt-3489808c1dcd157ac09dd6da16bc057b56696d59.zip
Qt-3489808c1dcd157ac09dd6da16bc057b56696d59.tar.gz
Qt-3489808c1dcd157ac09dd6da16bc057b56696d59.tar.bz2
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>
-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 82311d2..00357a1 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