diff options
author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-08-31 18:13:28 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-08-31 18:13:28 +0200 |
commit | 3cc148853f0f7468526df9dd2397a70a8eeeedae (patch) | |
tree | 64abd86c07654a52ee44ba9ace28ca0455721704 /src/webengine/render_widget_host_view_qt_delegate_quick.cpp | |
parent | 74b324b8f328e9d241984de6a9c43825fa298aff (diff) | |
parent | 44f41d30ed3efce2f1970dcd158555b41b38014d (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ic739ab9db0851cc13467168840ea2549996432f8
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 | 6 |
1 files changed, 3 insertions, 3 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 167df3e91..80bf0b49a 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -237,7 +237,7 @@ void RenderWidgetHostViewQtDelegateQuick::mousePressEvent(QMouseEvent *event) QQuickItem *parent = parentItem(); if (!m_isPopup && (parent && parent->property("activeFocusOnPress").toBool())) forceActiveFocus(); - if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { + if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { event->ignore(); return; } @@ -257,7 +257,7 @@ void RenderWidgetHostViewQtDelegateQuick::mouseMoveEvent(QMouseEvent *event) void RenderWidgetHostViewQtDelegateQuick::mouseReleaseEvent(QMouseEvent *event) { QQuickItem *parent = parentItem(); - if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { + if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { event->ignore(); return; } @@ -295,7 +295,7 @@ void RenderWidgetHostViewQtDelegateQuick::touchEvent(QTouchEvent *event) void RenderWidgetHostViewQtDelegateQuick::hoverMoveEvent(QHoverEvent *event) { QQuickItem *parent = parentItem(); - if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { + if (!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) { event->ignore(); return; } |