summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-23 13:05:12 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-23 13:06:03 (GMT)
commitda40c39eb802a40a9108406d1665d9d9b19a7b3c (patch)
treec5b1314bedc343b960044a5d4e3f96515dfc06a8 /src/3rdparty/webkit/VERSION
parentb8367d1c0846455e9055aed7ff5a0e438531a9ae (diff)
downloadQt-da40c39eb802a40a9108406d1665d9d9b19a7b3c.zip
Qt-da40c39eb802a40a9108406d1665d9d9b19a7b3c.tar.gz
Qt-da40c39eb802a40a9108406d1665d9d9b19a7b3c.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( efa69b6181ce5c045097351cdcf6c158da3f4888 )
Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-19 Olivier Goffart <ogoffart@trolltech.com> Reviewed by Simon Hausmann. [Qt] Normalize signal and slot signatures. * Api/qgraphicswebview.cpp: (QGraphicsWebView::setPage): * Api/qwebview.cpp: (QWebView::setPage): * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::setFrame): * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp: (wrapInFunction): * tests/qwebframe/tst_qwebframe.cpp: * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::modified): (tst_QWebPage::database):
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 f40dda4..5818e83 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
- 7bdf90f753d25fb1b5628b0980827df11110ad5a
+ efa69b6181ce5c045097351cdcf6c158da3f4888