diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-04-03 07:43:48 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-04 07:49:10 (GMT) |
| commit | cd626dad3e92475c2a8f6a894046a14c95711d50 (patch) | |
| tree | 116f124eb4c5a95cfa979d5bc15c6dbe9b3d3f2f | |
| parent | 3bb80da20a985ccdef5e946a88d57146849bdadf (diff) | |
| download | Qt-cd626dad3e92475c2a8f6a894046a14c95711d50.zip Qt-cd626dad3e92475c2a8f6a894046a14c95711d50.tar.gz Qt-cd626dad3e92475c2a8f6a894046a14c95711d50.tar.bz2 | |
Updated WebKit to 9c745c625c6d1112cec51d742ecc8c041cc090d7
Backport Casper's doc fix from https://bugs.webkit.org/show_bug.cgi?id=82893
Change-Id: I85bd671132fe6e1bb8798960ef0db7f02e10b4b4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| -rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/ChangeLog | 12 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 2705660..82cb8f5 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -c0107296d95cf4f2e988513db42572976ff7d55e +9c745c625c6d1112cec51d742ecc8c041cc090d7 diff --git a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog index 7ba98b8..048500d 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog @@ -1,3 +1,15 @@ +2012-04-02 Casper van Donderen <casper.vandonderen@nokia.com> + + Qt: Doc: Fix typo which marks document to be printed in console font. + https://bugs.webkit.org/show_bug.cgi?id=82893 + + Reviewed by Simon Hausmann. + + The qtwebkit-bridge.qdoc file contained a typo where a \c {} was + missing its closing curly bracket, this marked the rest of the page as + text to be printed using the code/console font. + * docs/qtwebkit-bridge.qdoc: + 2011-11-03 Jesus Sanchez-Palencia <jesus@webkit.org> Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc b/src/3rdparty/webkit/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc index 0947a0a..dc5928e 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc +++ b/src/3rdparty/webkit/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc @@ -132,7 +132,7 @@ \snippet webkitsnippets/qtwebkit_bridge_snippets.cpp 10 - The call to \c{connect() establishes a connection between the signal + The call to \c{connect()} establishes a connection between the signal \c{somethingChanged} and the slot \c{function}. Whenever the object \c{myObject} emits the signal \c{somethingChanged}, the slot \c{function} of the object \c{thisObject} gets called automatically. Let's illustrate diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index f777bbc..b352b88 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - c0107296d95cf4f2e988513db42572976ff7d55e + 9c745c625c6d1112cec51d742ecc8c041cc090d7 |