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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 60e04102f50c994d83f3e78df701a4d6c6e0761d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 13 09:31:41 2009 +0000

    2009-12-13  Simon Hausmann  <hausmann at webkit.org>
    
            Reviewed by Holger Freyther.
    
            [Qt] Re-enable QWebView::renderHints property for Qt for Symbian
    
            https://bugs.webkit.org/show_bug.cgi?id=28273
    
            The bug in Qt's moc that triggered a linking error when declaring this
            property has been fixed and we can remove the workaround.
    
            * Api/qwebview.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52065 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebview.h b/WebKit/qt/Api/qwebview.h
index d7910d9..f681fbc 100644
--- a/WebKit/qt/Api/qwebview.h
+++ b/WebKit/qt/Api/qwebview.h
@@ -49,12 +49,7 @@ class QWEBKIT_EXPORT QWebView : public QWidget {
     Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
 
-// 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.  
-// See bug: http://qt.nokia.com/developer/task-tracker/index_html?method=entry&id=258893
-#if defined(Q_QDOC) || !defined(Q_OS_SYMBIAN)
     Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
-#endif
     Q_FLAGS(QPainter::RenderHints)
 public:
     explicit QWebView(QWidget* parent = 0);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 5369e5c..a5a12ee 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-13  Simon Hausmann  <hausmann at webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Re-enable QWebView::renderHints property for Qt for Symbian
+
+        https://bugs.webkit.org/show_bug.cgi?id=28273
+
+        The bug in Qt's moc that triggered a linking error when declaring this
+        property has been fixed and we can remove the workaround.
+
+        * Api/qwebview.h:
+
 2009-12-11  Yael Aharon  <yael.aharon at nokia.com>
 
         Unreviewed build fix for Qt versions < 4.6.

-- 
WebKit Debian packaging