diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-25 09:06:28 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-25 09:06:28 (GMT) |
| commit | 9c160157d9617866ae792480a46877dcd82b9e91 (patch) | |
| tree | 0f4610709807ad87536ebb19ba6df23c6eed43b9 /src/3rdparty | |
| parent | dae9a234412d09c1af67a34262637bdc6e8c0845 (diff) | |
| parent | 8b5a400581b9c037d12a9f49e075b187edcb0b00 (diff) | |
| download | Qt-9c160157d9617866ae792480a46877dcd82b9e91.zip Qt-9c160157d9617866ae792480a46877dcd82b9e91.tar.gz Qt-9c160157d9617866ae792480a46877dcd82b9e91.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty')
| -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 250eb90..26ce489 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 4828543..01b68eb 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 640f652..c3bd633 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" |