summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-11-24 15:22:19 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-11-24 15:22:19 (GMT)
commit97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0 (patch)
treedd3645a6afc426a804e73df378c3d47906a8bcf9 /src/3rdparty/webkit/WebKit/qt
parent8eea9828289b842c8a300f1f4309d059b15fd7b0 (diff)
parent792e43aa2607d21deeada4b9f14bb82dc96ad4ec (diff)
downloadQt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.zip
Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.tar.gz
Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/ChangeLog19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 457e9c2..2408dd4 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,22 @@
+2009-11-19 Olivier Goffart <ogoffart@trolltech.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Normalize signal and slot signatures.
+
+ * Api/qgraphicswebview.cpp:
+ (QGraphicsWebView::setPage):
+ * Api/qwebview.cpp:
+ (QWebView::setPage):
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::setFrame):
+ * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp:
+ (wrapInFunction):
+ * tests/qwebframe/tst_qwebframe.cpp:
+ * tests/qwebpage/tst_qwebpage.cpp:
+ (tst_QWebPage::modified):
+ (tst_QWebPage::database):
+
2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed by Simon Hausmann.