summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/VERSION
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-02 07:59:19 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-02 07:59:19 (GMT)
commitdb36d8397aa21d947abd969ee35e017935705217 (patch)
treea975a4cd99a5933ecb925c1b91ce94e554729a8c /src/3rdparty/webkit/VERSION
parent385bb34a9dc8e7bd6d1d3c11247862b87978d629 (diff)
downloadQt-db36d8397aa21d947abd969ee35e017935705217.zip
Qt-db36d8397aa21d947abd969ee35e017935705217.tar.gz
Qt-db36d8397aa21d947abd969ee35e017935705217.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 9c6a4a25fe741b43dd64f5dbaeccfb647cb321fb )
Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-04-02 Takumi Asaki <takumi.asaki@nokia.com> Reviewed by Simon Hausmann. Fix pre-edit handling of text fields with input methods. The input method sends an empty preeditString() if all characters of the preedit should be deleted. So inputMethodEvent() has to use preeditString() if it's empty. * Api/qwebpage.cpp: (QWebPagePrivate::inputMethodEvent): 2009-03-30 Simon Hausmann <simon.hausmann@nokia.com> Rubber-stamped by Tor Arne Vestbø. Document that setHtml/setContent loads only the html/data immediately, not external objects. * Api/qwebframe.cpp: * Api/qwebview.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 96840d0..1ebf6ef 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
- 1beae2b64b5b1e9b97e82dc94de18ebac1c19efc
+ 9c6a4a25fe741b43dd64f5dbaeccfb647cb321fb