diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-03-24 11:17:14 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-03-24 11:19:18 (GMT) |
| commit | 903d7a43a5d936bb1e853e5add7c4c3c5503737e (patch) | |
| tree | 87ef241bfbe81d7835f167beba9d94b7180a9ecd /src/3rdparty/webkit/WebKit | |
| parent | 0a421828aefe0877defc254bc8f4af29204b97f1 (diff) | |
| download | Qt-903d7a43a5d936bb1e853e5add7c4c3c5503737e.zip Qt-903d7a43a5d936bb1e853e5add7c4c3c5503737e.tar.gz Qt-903d7a43a5d936bb1e853e5add7c4c3c5503737e.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-03-21 axis
Reviewed by Simon Hausmann.
Fixed updating the VKB display when inputting into QGraphicsWebView.
https://bugs.webkit.org/show_bug.cgi?id=36292
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::_q_updateMicroFocus):
(QGraphicsWebView::setPage):
* Api/qgraphicswebview.h:
WebCore:
[Qt] Support for QT_LIBINFIX in Symbian builds
Patch by Miikka Heikkinen <miikka.heikkinen@digia.com> on 2010-03-19
Reviewed by Simon Hausmann.
Configuring Qt with -qtlibinfix parameter will enable installing
an alternate version of Qt on devices that already have it on ROM.
This patch provides support for infixed builds of Webkit.
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.h index 68379a2..f983ae4 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.h @@ -134,10 +134,10 @@ protected: private: Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success)) + Q_PRIVATE_SLOT(d, void _q_updateMicroFocus()) QGraphicsWebViewPrivate* const d; friend class QGraphicsWebViewPrivate; }; #endif // QGraphicsWebView_h - Q_PRIVATE_SLOT(d, void _q_updateMicroFocus()) |