[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f0fb4730b992a1e943dcd5cea8b4e94bcffd7674
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 03:20:34 2009 +0000

    [Qt] Various doc fixes
    https://bugs.webkit.org/show_bug.cgi?id=31358
    
    Reviewed by Kenneth Christiansen.
    
    Fixed wrong documentation: item's dimensions do fit to Web page
    content by default.
    
    Kenneth agreed to land this as a followup patch to the
    just landed documentation patch.
    
    * Api/qgraphicswebview.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50860 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 34f9366..1fbe3bb 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -164,9 +164,9 @@ QObject* QGraphicsWebViewPrivate::pluginParent() const
     An instance of this class renders Web content from a URL or supplied as data, using
     features of the QtWebKit module.
 
-    If the width and height of the item is not set, they will dynamically adjust to
-    a size appropriate for the content. This width may be large (e.g., 980 pixels or
-    more) for typical online Web pages.
+    If the width and height of the item are not set, they will default to 800 and 600,
+    respectively. If the Web page contents is larger than that, scrollbars will be shown
+    if not disabled explicitly.
 
     \section1 Browser Features
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 0b061c6..bd8c4ad 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-11  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] Various doc fixes
+        https://bugs.webkit.org/show_bug.cgi?id=31358
+
+        Fixed wrong documentation: item's dimensions do fit to Web page
+        content by default.
+
+        Kenneth agreed to land this as a followup patch to the
+        just landed documentation patch.
+
+        * Api/qgraphicswebview.cpp:
+
 2009-11-11  David Boddie  <dboddie at trolltech.com>
 
         Reviewed by Kenneth Christiansen.

-- 
WebKit Debian packaging