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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8be27280d0f0b97ca58f20fe78f6782dca33f979
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 10:44:02 2009 +0000

    Doc: Document HTML and status as properties.
    
    Patch by Volker Hilsheimer <volker.hilsheimer at nokia.com> on 2009-10-07
    Reviewed by Simon Hausmann.
    
    * Api/qgraphicswebview.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 29490a7..aa7680f 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -403,7 +403,8 @@ void QGraphicsWebView::setGeometry(const QRectF& rect)
 }
 
 /*!
-    \brief The load status message associated to the web graphicsitem
+    \property QGraphicsWebView::status
+    \brief the load status message.
 
     Provides the latest status message set during the load of a URL.
     Commonly shown by Status Bar widgets.
@@ -503,14 +504,15 @@ void QGraphicsWebView::load(const QNetworkRequest& request,
 }
 
 /*!
-    Sets the content of the web graphicsitem to the specified \a html.
+    \property QGraphicsWebView::html
+    This property provides an HTML interface to the text in the webview.
 
-    External objects such as stylesheets or images referenced in the HTML
-    document are located relative to \a baseUrl.
+    When setting this property, external objects such as stylesheets or images
+    referenced in the HTML document are located relative to \a baseUrl.
 
     The \a html is loaded immediately; external objects are loaded asynchronously.
 
-    When using this method, WebKit assumes that external resources such as
+    When using these methods, WebKit assumes that external resources such as
     JavaScript programs or style sheets are encoded in UTF-8 unless otherwise
     specified. For example, the encoding of an external script can be specified
     through the charset attribute of the HTML script tag. Alternatively, the
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2e85d50..da1699a 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-07  Volker Hilsheimer  <volker.hilsheimer at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Doc: Document HTML and status as properties.
+
+        * Api/qgraphicswebview.cpp:
+
 2009-10-07  Martin Smith  <msmith at trolltech.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging