[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hausmann at webkit.org
hausmann at webkit.org
Wed Apr 7 23:19:38 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b191336fdbdb31f991209913964cdbd26fc4676a
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 3 15:06:59 2009 +0000
Rubber-stamped by Tor Arne Vestbø.
Patch by Simon Hausmann <hausmann at webkit.org> on 2009-11-03
Oops, also remove the API docs of the removed networkRequestStarted() signal.
* Api/qwebpage.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50455 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index c512557..1bf04af 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -3389,16 +3389,6 @@ quint64 QWebPage::bytesReceived() const
*/
/*!
- \since 4.6
- \fn void QWebPage::networkRequestStarted(QWebFrame* frame, QNetworkRequest* request);
- \preliminary
-
- This signal is emitted when a \a frame of the current page requests a web resource. The application
- may want to associate the \a request with the \a frame that initiated it by storing the \a frame
- as an attribute of the \a request.
-*/
-
-/*!
\fn QWebPagePrivate* QWebPage::handle() const
\internal
*/
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b64465e..827f50b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,13 @@
2009-11-03 Simon Hausmann <hausmann at webkit.org>
+ Rubber-stamped by Tor Arne Vestbø.
+
+ Oops, also remove the API docs of the removed networkRequestStarted() signal.
+
+ * Api/qwebpage.cpp:
+
+2009-11-03 Simon Hausmann <hausmann at webkit.org>
+
Reviewed by Tor Arne Vestbø.
Replace the QWebPage::networkRequestStarted() signal with the originatingObject
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list