diff options
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-features.qdoc | 4 | ||||
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc index 7850ff35d..545d230ef 100644 --- a/src/webengine/doc/src/qtwebengine-features.qdoc +++ b/src/webengine/doc/src/qtwebengine-features.qdoc @@ -55,10 +55,10 @@ Qt WebEngine supports the MPEG-4 Part 14 (MP4) file format only if the required proprietary audio and video codecs, such as H.264 and MPEG layer-3 (MP3), have been enabled. Proprietary codecs can be enabled by passing the - following option to qmake when building Qt WebEngine: + following option when configuring Qt: \code - qmake WEBENGINE_CONFIG+=use_proprietary_codecs + -proprietary-codecs \endcode \warning When distributing proprietary codec libraries, you must acquire 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); } |