diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-01-07 18:07:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 18:17:48 +0100 |
| commit | a368034d670a2f64db46025f396b9661a1558070 (patch) | |
| tree | 32de083b81ed814505ae0ab8622ab093374307f8 | |
| parent | d92f0c4f34bed79d8296126016330c9df138c54b (diff) | |
Reapply mouse event handling in QQuickWebViewFlickablePrivate.
This reapplies commit 0b789c6a785d5ef45c3f6f2fc0f8694772b3d392,
which had been in Qt 5.0.x and 5.1.x, but was not upstreamed
and hence overwritten when importing the new snapshot.
This basically reverts http://trac.webkit.org/changeset/136119.
Task-number: QTBUG-35097
Change-Id: I3e02c3feeb5193c0c06b7525469e208de1d6cafc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 5 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index c89ee79fe..1ad486950 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -1063,6 +1063,11 @@ void QQuickWebViewFlickablePrivate::pageDidRequestScroll(const QPoint& pos) m_pageViewportController->pageDidRequestScroll(pos); } +void QQuickWebViewFlickablePrivate::handleMouseEvent(QMouseEvent* event) +{ + pageEventHandler->handleInputEvent(event); +} + QQuickWebViewExperimental::QQuickWebViewExperimental(QQuickWebView *webView, QQuickWebViewPrivate* webViewPrivate) : QObject(webView) , q_ptr(webView) diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h index f1ce17114..b39a4f071 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h @@ -246,6 +246,7 @@ public: virtual void updateViewportSize(); virtual void pageDidRequestScroll(const QPoint& pos); + virtual void handleMouseEvent(QMouseEvent*); private: QScopedPointer<WebKit::PageViewportController> m_pageViewportController; |