summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/ChangeLog
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-21 15:25:52 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-21 15:25:52 (GMT)
commiteee847d00f6de755909d6f913430da662f26c503 (patch)
tree712795fb3367554dce0841352229098e9f1a614c /src/3rdparty/webkit/WebKit/qt/ChangeLog
parentb429da3c77ea053fb6a0cbfe71c74da91be91c67 (diff)
parent8a83c72ec6de938124c869983fc5980dd3d0ae0c (diff)
downloadQt-eee847d00f6de755909d6f913430da662f26c503.zip
Qt-eee847d00f6de755909d6f913430da662f26c503.tar.gz
Qt-eee847d00f6de755909d6f913430da662f26c503.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f ) tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/ChangeLog')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/ChangeLog16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index d6b4a9d..3a1735f 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-05-12 Joe Ligman <joseph.ligman@nokia.com>
+
+ Reviewed by Laszlo Gombos.
+
+ [Qt] Nested overflow div does not scroll
+ https://bugs.webkit.org/show_bug.cgi?id=38641
+
+ Modify qtwebkit_webframe_scrollOverflow, if the current node's render layer
+ does not scroll it will try and scroll the parent's render layer. Also export
+ qtwebkit_webframe_scrollOverflow so we can use it independently of
+ qtwebkit_webframe_scrollRecursively
+
+ * Api/qwebframe.cpp:
+ (qtwebkit_webframe_scrollOverflow):
+ (qtwebkit_webframe_scrollRecursively):
+
2010-04-26 Thiago Macieira <thiago.macieira@nokia.com>
Reviewed by Simon Hausmann.