summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-05-13 21:08:38 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-05-13 21:08:38 (GMT)
commit761a32a67bb1d4702269ab998ffcf3772fd64d06 (patch)
tree31acca3e9689941588ff0acbe0a1903f828fbaf1 /src/3rdparty
parent115b7172d54a5a331b9e00d20f6694749179c484 (diff)
downloadQt-761a32a67bb1d4702269ab998ffcf3772fd64d06.zip
Qt-761a32a67bb1d4702269ab998ffcf3772fd64d06.tar.gz
Qt-761a32a67bb1d4702269ab998ffcf3772fd64d06.tar.bz2
Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc
Disable the JIT on Symbian again, as it causes crashes.
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/.tag2
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/ChangeLog12
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h3
-rw-r--r--src/3rdparty/webkit/VERSION2
4 files changed, 2 insertions, 17 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index d8b4b32..14af7e9 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-57d10d5c05e59bbf7de8189ff47dd18d1be996dc
+5cf023650a8da206a8cf3130e9d4820b95e1bc7c
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
index 97176ef..1610036 100644
--- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
@@ -21,18 +21,6 @@
* wtf/Platform.h:
-2010-05-02 Laszlo Gombos <laszlo.1.gombos@nokia.com>
-
- Reviewed by Eric Seidel.
-
- [Qt] Enable JIT for QtWebKit on Symbian
- https://bugs.webkit.org/show_bug.cgi?id=38339
-
- JIT on Symbian has been stable for quite some time, it
- is time to turn it on by default.
-
- * wtf/Platform.h:
-
2010-04-28 Simon Hausmann <simon.hausmann@nokia.com>, Kent Hansen <kent.hansen@nokia.com>
Reviewed by Darin Adler.
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
index 8d98765..fac477e 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -937,8 +937,6 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
#define ENABLE_JIT 1
#elif CPU(ARM_TRADITIONAL) && OS(LINUX)
#define ENABLE_JIT 1
-#elif CPU(ARM_TRADITIONAL) && OS(SYMBIAN) && COMPILER(RVCT)
- #define ENABLE_JIT 1
#endif
#endif /* PLATFORM(QT) */
@@ -1008,7 +1006,6 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
|| (CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100) \
|| (CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100) \
|| (CPU(ARM_TRADITIONAL) && OS(LINUX)) \
- || (CPU(ARM_TRADITIONAL) && OS(SYMBIAN) && COMPILER(RVCT)) \
|| (CPU(MIPS) && OS(LINUX)) \
|| (CPU(X86) && OS(DARWIN)) \
|| (CPU(X86_64) && OS(DARWIN))
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index c8c2aa3..b8bac54 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
- dc5821c3df2ef60456d85263160852f5335cf946
+ 57d10d5c05e59bbf7de8189ff47dd18d1be996dc