[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ariya at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c5b641c412d9f4287d72eab05d37b784490368d8
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 15:16:52 2009 +0000

    QWebPage: Doc: setNetworkAccessManager should only be called once.
    
    Patch by Markus Goetz <Markus.Goetz at nokia.com> on 2009-10-19
    Reviewed by Ariya Hidayat.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49784 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 6a589c0..4c47e5b 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2868,6 +2868,9 @@ QNetworkProxy QWebPage::networkProxy() const
     Sets the QNetworkAccessManager \a manager responsible for serving network requests for this
     QWebPage.
 
+    \note It is currently not supported to change the network access manager after the
+    QWebPage has used it. The results of doing this are undefined.
+
     \sa networkAccessManager()
 */
 void QWebPage::setNetworkAccessManager(QNetworkAccessManager *manager)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 1dd7871..d62d4aa 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-19  Markus Goetz <Markus.Goetz at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        QWebPage: Doc: setNetworkAccessManager should only be called once.
+
+        * Api/qwebpage.cpp:
+
 2009-10-19  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Tor Arne.
@@ -7,7 +15,6 @@
         * Api/qgraphicswebview.cpp:
         (QGraphicsWebView::event):
 
-
 2009-10-19  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Holger Freyther.

-- 
WebKit Debian packaging