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

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c0d7722cf7950428e8c1c64e6520acd088a77db2
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 26 21:42:38 2009 +0000

    Unreviewed documentation fix from David Boddie (Qt Doc Team)
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-26
    Ensure that qdoc will always see the RenderHints property.
    
    The property was only defined in the header file if the Q_OS_SYMBIAN
    symbol was not defined, resulting in the property not showing up
    in the Qt documentation just because one platform doesn't support it.
    
    A follow up commit will improve the documentation for the property
    and note that it is not supported on the Symbiam platform.
    
    * Api/qwebview.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50096 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebview.h b/WebKit/qt/Api/qwebview.h
index 15b5836..b63a593 100644
--- a/WebKit/qt/Api/qwebview.h
+++ b/WebKit/qt/Api/qwebview.h
@@ -53,9 +53,8 @@ class QWEBKIT_EXPORT QWebView : public QWidget {
 
 // FIXME: temporary work around for elftran issue that it couldn't find the QPainter::staticMetaObject
 // symbol from Qt lib; it should be reverted after the right symbol is exported.  
-// remember to revert the qdoc \property comment as well.
 // See bug: http://qt.nokia.com/developer/task-tracker/index_html?method=entry&id=258893
-#if !defined(Q_OS_SYMBIAN)
+#if defined(Q_QDOC) || !defined(Q_OS_SYMBIAN)
     Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
 #endif
     Q_FLAGS(QPainter::RenderHints)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 642c836..c11f1d3 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-26  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Unreviewed documentation fix from David Boddie (Qt Doc Team)
+
+        Ensure that qdoc will always see the RenderHints property.
+
+        The property was only defined in the header file if the Q_OS_SYMBIAN
+        symbol was not defined, resulting in the property not showing up
+        in the Qt documentation just because one platform doesn't support it.
+
+        A follow up commit will improve the documentation for the property
+        and note that it is not supported on the Symbiam platform.
+
+        * Api/qwebview.h:
+
 2009-10-26  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Tor Arne Vestbø.

-- 
WebKit Debian packaging