summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>2011-09-20 14:12:04 (GMT)
committerZeno Albisser <zeno.albisser@nokia.com>2011-11-09 16:11:00 (GMT)
commit3c4f8767ccd4f6214eae17992aa7b0ad0630eb36 (patch)
treeeefd3c66506d8865a45fe2a9a321f3f5e489bb03
parent42543208749fc3b6b24983c0a7b3a6d8e62801a2 (diff)
downloadQt-3c4f8767ccd4f6214eae17992aa7b0ad0630eb36.zip
Qt-3c4f8767ccd4f6214eae17992aa7b0ad0630eb36.tar.gz
Qt-3c4f8767ccd4f6214eae17992aa7b0ad0630eb36.tar.bz2
Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c 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>
-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