diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-24 13:11:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-24 13:11:27 +0200 |
| commit | fc0c0621d8c5ffb89e4f9c72fa706b3f10aea97e (patch) | |
| tree | 22a3f183e1c2beb0e0bb196fbd19a9f33954cff3 | |
| parent | d489dc180c1e71de117e6d015c5645441eb9fb7f (diff) | |
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( a6ebe3865025e2bb4d767a79435af4daf5a9b4db )
Changes in WebKit since the last update:
++ b/WebKit/qt/ChangeLog
Rubber-stamped by Ariya Hidayat.
Fix qdoc warning about link to QAction::isEnabled.
* Api/qwebpage.cpp:
2009-04-24 Simon Hausmann <simon.hausmann@nokia.com>
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 250eb90913..26ce4893d5 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 - 242472777d440a540b4bc944c84eb522388e384e + a6ebe3865025e2bb4d767a79435af4daf5a9b4db diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 48285431d8..01b68eb891 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1095,7 +1095,7 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const This enum describes the types of action which can be performed on the web page. Actions only have an effect when they are applicable. The availability of - actions can be be determined by checking \l{QAction::}{enabled()} on the + actions can be be determined by checking \l{QAction::}{isEnabled()} on the action returned by \l{QWebPage::}{action()}. One method of enabling the text editing, cursor movement, and text selection actions diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 640f6527bb..c3bd63366d 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,5 +1,13 @@ 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> + Rubber-stamped by Ariya Hidayat. + + Fix qdoc warning about link to QAction::isEnabled. + + * Api/qwebpage.cpp: + +2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> + Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" |