summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/Api/qwebview.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-02-24 16:36:50 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-02-24 16:36:50 +0100
commitad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (patch)
treeb34b0daceb7c8e7fdde4b4ec43650ab7caadb0a9 /Source/WebKit/qt/Api/qwebview.cpp
parent03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (diff)
downloadqtwebkit-ad0d549d4cc13433f77c1ac8f0ab379c83d93f28.tar.gz
Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)
Diffstat (limited to 'Source/WebKit/qt/Api/qwebview.cpp')
-rw-r--r--Source/WebKit/qt/Api/qwebview.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit/qt/Api/qwebview.cpp b/Source/WebKit/qt/Api/qwebview.cpp
index 4a2d186a9..937d3bdca 100644
--- a/Source/WebKit/qt/Api/qwebview.cpp
+++ b/Source/WebKit/qt/Api/qwebview.cpp
@@ -703,7 +703,11 @@ bool QWebView::event(QEvent *e)
#endif
} else if (e->type() == QEvent::TouchBegin
|| e->type() == QEvent::TouchEnd
- || e->type() == QEvent::TouchUpdate) {
+ || e->type() == QEvent::TouchUpdate
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+ || e->type() == QEvent::TouchCancel
+#endif
+ ) {
d->page->event(e);
// Always return true so that we'll receive also TouchUpdate and TouchEnd events