diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-14 10:30:35 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-14 10:30:35 +0100 |
| commit | a38215f03d20ccbe2e15c16d0a4e3333614cb682 (patch) | |
| tree | 0286e23d4edfab7e40198f25d1861dac3e0d7e38 /src/webengine | |
| parent | da3c744b6a97660aae34067466d9624e1ca688e4 (diff) | |
| parent | 7a318602581fac0d4ad414ee62437554e9c9e959 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 2 | ||||
| -rw-r--r-- | src/webengine/webengine.pro | 2 |
2 files changed, 2 insertions, 2 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 209b5fbea..92aabac8e 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -211,6 +211,8 @@ void RenderWidgetHostViewQtDelegateQuick::wheelEvent(QWheelEvent *event) void RenderWidgetHostViewQtDelegateQuick::touchEvent(QTouchEvent *event) { + if (event->type() == QEvent::TouchBegin && !m_isPopup) + forceActiveFocus(); m_client->forwardEvent(event); } diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index 6d17fd2eb..15514e457 100644 --- a/src/webengine/webengine.pro +++ b/src/webengine/webengine.pro @@ -1,7 +1,5 @@ TARGET = QtWebEngine -CMAKE_MODULE_TESTS = "-" - # For our export macros DEFINES += QT_BUILD_WEBENGINE_LIB |