diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 11:40:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 12:57:21 +0200 |
| commit | ecb537e8233c8847d14f36ec3bf698711d6d151a (patch) | |
| tree | f9cb367d6e66067970102ed1864f7280f3750ccc /src/webengine/render_widget_host_view_qt_delegate_quick.cpp | |
| parent | 9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (diff) | |
| parent | ad55613c2648edb67353c3882d1956b54fc323b4 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index 650a40988..047737254 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -226,8 +226,10 @@ bool RenderWidgetHostViewQtDelegateQuick::event(QEvent *event) if (event->type() == QEvent::ShortcutOverride) return m_client->handleShortcutOverrideEvent(static_cast<QKeyEvent *>(event)); +#ifndef QT_NO_GESTURES if (event->type() == QEvent::NativeGesture) return m_client->forwardEvent(event); +#endif return QQuickItem::event(event); } |