summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-16 08:57:19 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-16 08:57:32 (GMT)
commit94e39aff7dd02d4a631d5c40c6f5a5f6fa424035 (patch)
tree7c68b7640835c1f4c681afb8acbacfdfc2a0fc32 /src/3rdparty/webkit/VERSION
parent6e8568ff784e093460e4383e32e064a49165c3a8 (diff)
downloadQt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.zip
Qt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.tar.gz
Qt-94e39aff7dd02d4a631d5c40c6f5a5f6fa424035.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.6-staging ( 751940f0f1fb2599250632d7f0a3ead3930466af )
Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-06-16 David Boddie <dboddie@trolltech.com> Reviewed by Simon Hausmann. Doc: Fixed QWebPage::forwardUnsupportedContent documentation and added more information about Web plugins. * Api/qwebpage.cpp: * Api/qwebsettings.cpp: * docs/qtwebkit.qdoc: 2009-06-16 Morten Engvoldsen <morten.engvoldsen@nokia.com> Reviewed by Ariya Hidayat. Clearifying QWebFrame docs Adding docs to toHtml() and toPlainText() * Api/qwebframe.cpp:
Diffstat (limited to 'src/3rdparty/webkit/VERSION')
-rw-r--r--src/3rdparty/webkit/VERSION4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index a0f039b..f3e81c1 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,8 +4,8 @@ This is a snapshot of the Qt port of WebKit from
The commit imported was from the
- qtwebkit-4.6-snapshot-15062009 branch/tag
+ origin/qtwebkit-4.6-staging branch/tag
and has the sha1 checksum
- 65232bf00dc494ebfd978f998c88f58d18ecce1e
+ 751940f0f1fb2599250632d7f0a3ead3930466af