[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:43:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c63c6506ad7216adbf67e3a983e1d0d4088fbd61
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 18 15:41:14 2010 +0000
2010-10-18 Yi Shen <yi.4.shen at nokia.com>
Reviewed by Antonio Gomes.
[QT] Unable to load pages on QtTestBrowser after canceling a page load.
https://bugs.webkit.org/show_bug.cgi?id=43827
* Api/qwebpage.cpp:
(QWebPage::triggerAction):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69961 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index d4f0d63..454376c 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2174,6 +2174,7 @@ void QWebPage::triggerAction(WebAction action, bool)
break;
case Stop:
mainFrame()->d->frame->loader()->stopForUserCancel();
+ d->updateNavigationActions();
break;
case Reload:
mainFrame()->d->frame->loader()->reload(/*endtoendreload*/false);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index c47e22a..93b0474 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-18 Yi Shen <yi.4.shen at nokia.com>
+
+ Reviewed by Antonio Gomes.
+
+ [QT] Unable to load pages on QtTestBrowser after canceling a page load.
+ https://bugs.webkit.org/show_bug.cgi?id=43827
+
+ * Api/qwebpage.cpp:
+ (QWebPage::triggerAction):
+
2010-10-15 Qi Zhang <qi.2.zhang at nokia.com>
Reviewed by Andreas Kling.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list