diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:31:50 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:31:50 +0100 |
commit | e11b03f3edbc713f7249b161be4b9610a9542dab (patch) | |
tree | 398c3ad1f35fb0358f90170e1e4b4c813a33e4d9 | |
parent | 5197906b6baee9c13b31286f2a0ebbfcac3961e0 (diff) | |
parent | 9b0de4a45f7172710d5722ff302d43efde2c5365 (diff) | |
download | qtwebkit-e11b03f3edbc713f7249b161be4b9610a9542dab.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id10708a0114ed30b712426b9e78168d288691b2e
-rw-r--r-- | Source/WebCore/WebCore.pri | 2 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 5 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 2675a310d..3f5002a42 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -203,7 +203,7 @@ enable?(WEB_AUDIO) { use?(3D_GRAPHICS) { win32: { - win32-g++: { + win32-g++*: { # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols contains(QT_CONFIG, opengles2) { CONFIG(debug, debug|release):contains(QT_CONFIG, angle) { 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; |