summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-01-07 12:19:02 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-01-07 12:19:02 (GMT)
commit0abf84be1a715db1d6adc5bf21e150e949e0e9e9 (patch)
tree128297f3532e4c33ebbb6233399bb09f5ed411fb /src/3rdparty/webkit/VERSION
parentf16556359c24b04afe5af53ddbb80c4392d6dabb (diff)
downloadQt-0abf84be1a715db1d6adc5bf21e150e949e0e9e9.zip
Qt-0abf84be1a715db1d6adc5bf21e150e949e0e9e9.tar.gz
Qt-0abf84be1a715db1d6adc5bf21e150e949e0e9e9.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b217cdfedc7b5e7581325bda718192247f03dd5d )
Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-07 Yongjun Zhang <yongjun.zhang@nokia.com>, Laszlo Gombos <laszlo.1.gombos@nokia.com> Reviewed by Simon Hausmann. [Qt] need an API to suspend and resume active Javascript DOM objects. https://bugs.webkit.org/show_bug.cgi?id=31673 Add suspend and resume DOM objects private API to QWebFrame. * Api/qwebframe.cpp: (qt_suspendActiveDOMObjects): (qt_resumeActiveDOMObjects):
Diffstat (limited to 'src/3rdparty/webkit/VERSION')
-rw-r--r--src/3rdparty/webkit/VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 70913ca..6b107cd 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
and has the sha1 checksum
- 865abd2871c801c1d3d0f4eebd985b2daab89ebe
+ b217cdfedc7b5e7581325bda718192247f03dd5d