summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-01-12 11:28:22 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-01-12 11:28:22 (GMT)
commit04bdf9f6a77e9ebf96431f89b8240a037b3d2b09 (patch)
treeb79f63e113a1b025421dcafb821e026376011a64 /src/3rdparty/webkit/VERSION
parentd1f73b7be62b0f6e9294b5d78ccd0680cb9fe118 (diff)
downloadQt-04bdf9f6a77e9ebf96431f89b8240a037b3d2b09.zip
Qt-04bdf9f6a77e9ebf96431f89b8240a037b3d2b09.tar.gz
Qt-04bdf9f6a77e9ebf96431f89b8240a037b3d2b09.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591b4acaf2172ab05702153ef539c0ac89cbb )
Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-18 Joe Ligman <joseph.ligman@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Add new API to QWebFrame to scrollRecursively starting with any css overflow then checking current frame and then ancestors https://bugs.webkit.org/show_bug.cgi?id=32668 * Api/qwebframe.cpp: (QWebFramePrivate::scrollOverflow): (QWebFrame::scrollRecursively): * Api/qwebframe.h: * Api/qwebframe_p.h: * tests/qwebframe/qwebframe.qrc: * tests/qwebframe/testiframe.html: Added. * tests/qwebframe/testiframe2.html: Added. * tests/qwebframe/tst_qwebframe.cpp:
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 0b88429..b69ac98 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
- 99ccc1c3e4db5354246720f9b9aa3d282e64497d
+ bd6591b4acaf2172ab05702153ef539c0ac89cbb