diff options
author | Zeno Albisser <zeno.albisser@nokia.com> | 2011-11-09 16:01:09 (GMT) |
---|---|---|
committer | Zeno Albisser <zeno.albisser@nokia.com> | 2011-11-09 16:01:09 (GMT) |
commit | 5cc8175242addb6668c3af299e9bc002f23527a2 (patch) | |
tree | e653c22374ba861091284e073e81db962a14f3db /src/3rdparty | |
parent | e3208a8d44423bc3b5c32e2e90f68675e51a3b73 (diff) | |
download | Qt-5cc8175242addb6668c3af299e9bc002f23527a2.zip Qt-5cc8175242addb6668c3af299e9bc002f23527a2.tar.gz Qt-5cc8175242addb6668c3af299e9bc002f23527a2.tar.bz2 |
Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
-rw-r--r-- | src/3rdparty/webkit/ChangeLog | 20 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/WebCore.pri | 4 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h | 86 | ||||
-rw-r--r-- | src/3rdparty/webkit/Source/WebKit.pri | 10 | ||||
-rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
6 files changed, 73 insertions, 51 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index a5f6423..12a28b8 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -99371ddc1d61832131835964a753e1c5817f6916 +52a11cec052aa40d3bbc06861be1177b649b4a99 diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index a661d6a..bbaf26d 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,23 @@ +2011-11-09 Zeno Albisser <zeno.albisser@nokia.com> + + [Qt] Unreviewed: Fix build on Mac. + https://bugreports.qt.nokia.com/browse/QTBUG-20619 + + This bug was introduced by the previous commit + for the same bugreport. + + * Source/WebKit.pri: + +2011-11-09 Zeno Albisser <zeno.albisser@nokia.com> + + [Qt] Unreviewed: Fix debug_and_release build on Windows. + https://bugreports.qt.nokia.com/browse/QTBUG-20619 + + This bug was introduced by the previous commit + for the same bugreport. + + * Source/WebKit.pri: + 2011-11-03 Zeno Albisser <zeno.albisser@nokia.com> [Qt] Unreviewed: Fix universal binary build on Mac. diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri index d8ba8a6..82311d2 100644 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri @@ -153,7 +153,7 @@ symbian { CONFIG += do_not_build_as_thumb CONFIG(release, debug|release): QMAKE_CXXFLAGS.ARMCC += -OTime -O3 - # Symbian plugin support. + # Symbian plugin support LIBS += -lefsrv !CONFIG(QTDIR_build) { @@ -303,7 +303,7 @@ win32-* { } # Remove whole program optimizations due to miscompilations -win32-msvc2005|win32-msvc2008|win32-msvc2010|wince*:{ +win32-msvc2005|win32-msvc2008|wince*:{ QMAKE_CFLAGS_RELEASE -= -GL QMAKE_CXXFLAGS_RELEASE -= -GL diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h index 7713002..01c6ac2 100644 --- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h +++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h @@ -1,43 +1,43 @@ -/* - * Copyright (C) 2009 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef JSExceptionBase_h -#define JSExceptionBase_h - -namespace JSC { - -class JSValue; - -} // namespace JSC - -namespace WebCore { - -class ExceptionBase; - -ExceptionBase* toExceptionBase(JSC::JSValue); - -} // namespace WebCore - -#endif // JSExceptionBase_h +/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef JSExceptionBase_h
+#define JSExceptionBase_h
+
+namespace JSC {
+
+class JSValue;
+
+} // namespace JSC
+
+namespace WebCore {
+
+class ExceptionBase;
+
+ExceptionBase* toExceptionBase(JSC::JSValue);
+
+} // namespace WebCore
+
+#endif // JSExceptionBase_h
diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri index bc889d1..c469d1a 100644 --- a/src/3rdparty/webkit/Source/WebKit.pri +++ b/src/3rdparty/webkit/Source/WebKit.pri @@ -12,10 +12,12 @@ CONFIG(QTDIR_build) { win32|mac:!macx-xcode:CONFIG += debug_and_release # In case we are building a universal binary for Qt, building debug is not # possible because we would exceed the maximum library size for 32bit. - mac:CONFIG(QT_CONFIG, x86):CONFIG(QT_CONFIG, x86_64):debug|debug_and_release { - message(Building a universal binary with debug symbols is not possible. Building release!) - CONFIG -= debug_and_release debug - CONFIG += release + mac:contains(QT_CONFIG, x86):contains(QT_CONFIG, x86_64) { + CONFIG(debug_and_release)|CONFIG(debug, debug|release) { + message(Building a universal binary with debug symbols is not possible. Building release!) + CONFIG -= debug_and_release debug + CONFIG += release + } } } else { !CONFIG(release, debug|release) { diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 19f5536..750e7e7 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 99371ddc1d61832131835964a753e1c5817f6916 + 52a11cec052aa40d3bbc06861be1177b649b4a99 |