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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit fb03a7691c5678c8f1526259dc52dabb53048b23
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 11 16:15:30 2010 +0000

    [Qt] Add private API for QWebFrame scrolling, to maintain binary compatibility with Qt 4.6.
    
    Reviewed by Holger Freyther.
    
    This is just a temporary addition until we have introduced #ifdefs to allow
    safely removing the private API again.
    
    * Api/qwebframe.cpp:
    (qtwebkit_webframe_scrollRecursively):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53077 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 7f3c53e..5c07f0f 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -1098,6 +1098,11 @@ bool QWebFrame::scrollRecursively(int dx, int dy)
     return (scrolledHorizontal || scrolledVertical || scrolledOverflow);
 }
 
+bool QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int dx, int dy)
+{
+    return qFrame->scrollRecursively(dx, dy);
+}
+
 /*!
   \property QWebFrame::scrollPosition
   \since 4.5
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f4e021d..a5733da 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-11  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Add private API for QWebFrame scrolling, to maintain binary compatibility with Qt 4.6.
+
+        This is just a temporary addition until we have introduced #ifdefs to allow
+        safely removing the private API again.
+
+        * Api/qwebframe.cpp:
+        (qtwebkit_webframe_scrollRecursively):
+
 2010-01-10  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Adam Barth.

-- 
WebKit Debian packaging