diff options
author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2009-04-06 13:57:22 (GMT) |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2009-04-06 13:59:13 (GMT) |
commit | 1d3706f2b66ba5fbb586e532fc29852f55d81c86 (patch) | |
tree | 067265672b288ec843dba8c0771067e76a21e68d /src/3rdparty/webkit/WebKit | |
parent | 8873580b3474f5e0fc7a48ba7b4c7d65c0acce26 (diff) | |
download | Qt-1d3706f2b66ba5fbb586e532fc29852f55d81c86.zip Qt-1d3706f2b66ba5fbb586e532fc29852f55d81c86.tar.gz Qt-1d3706f2b66ba5fbb586e532fc29852f55d81c86.tar.bz2 |
Update WebKit from code.staikos.net/srv/git/webkit
Using branch origin/qtwebkit-4.5 (f72c14123c593dc9d649d25b7186334bba0026b5)
Changes in WebKit since the last update:
++ b/WebCore/ChangeLog
2009-04-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Don't show and hide the platformPluginWidget, as it's our QWebView
* plugins/mac/PluginViewMac.cpp:
(WebCore::PluginView::show):
(WebCore::PluginView::hide):
(WebCore::PluginView::setParentVisible):
2009-04-06 Mike Belshe <mike@belshe.com>
Reviewed by Eric Seidel.
HTMLCanvasElement crash when ImageBuffer creation fails.
https://bugs.webkit.org/show_bug.cgi?id=23212
Check for NULL before using the ImageBuffer as we might
be low on memory and creation may have failed.
Test case creation blocked by:
https://bugs.webkit.org/show_bug.cgi?id=25055
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::createImageBuffer):
2009-04-05 Erik L. Bunce <elbunce@xendom.com>
Reviewed by Simon Hausmann.
https://bugs.webkit.org/show_bug.cgi?id=25050
Fix an assert failure when dropping an 'empty' text/uri-list on a QWebView.
* platform/qt/DragDataQt.cpp:
(WebCore::DragData::asURL):
++ b/WebKitTools/ChangeLog
2009-03-31 Adam Roben <aroben@apple.com>
Make resolve-ChangeLogs -f work when the working tree has spaces in
its path
Reviewed by Mark Rowe and David Kilzer.
* Scripts/resolve-ChangeLogs:
(sub fixMergedChangeLogs): Quote the path to resolve-ChangeLogs in
case it contains spaces.
2009-03-17 David Kilzer <ddkilzer@apple.com>
resolve-ChangeLogs should not die on unmerged non-ChangeLog files
Reviewed by Adam Roben.
Fixes the following bug in resolve-ChangeLogs:
Use of uninitialized value in -e at ./WebKitTools/Scripts/resolve-ChangeLogs line 132.
Died at ./WebKitTools/Scripts/resolve-ChangeLogs line 164.
* Scripts/resolve-ChangeLogs:
(findUnmergedChangeLogs): Check the result of findChangeLog() to
make sure we don't add undef values to the list of files being
returned.
2009-03-11 David Kilzer <ddkilzer@apple.com>
Bug 24378: resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs
<https://bugs.webkit.org/show_bug.cgi?id=24378>
Reviewed by Adam Roben.
* Scripts/resolve-ChangeLogs: If -f|--fix-merged is not passed
and no file or directory names are specified on the command-line
then try to find unmerged ChangeLog files based on 'svn stat' or
'git diff'. Added global $isGit and $isSVN variables so that
isGit() and isSVN() only have to be called once.
(findUnmergedChangeLogs): Added.
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index 14288e2..de37383 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::}{isEnabled()} on the + actions can be be determined by checking \l{QAction::}{enabled()} on the action returned by \l{QWebPage::}{action()}. One method of enabling the text editing, cursor movement, and text selection actions |