Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d

1 files changed, 27 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 9ad86800c..5e39cc2b3 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -222,18 +222,33 @@ void RenderWidgetHostViewQtDelegateQuick::focusOutEvent(QFocusEvent *event)
 
 void RenderWidgetHostViewQtDelegateQuick::mousePressEvent(QMouseEvent *event)
 {
-    if (!m_isPopup && (parentItem() && parentItem()->property("activeFocusOnPress").toBool()))
+    QQuickItem *parent = parentItem();
+    if (!m_isPopup && (parent && parent->property("activeFocusOnPress").toBool()))
         forceActiveFocus();
+    if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+        event->ignore();
+        return;
+    }
     m_client->forwardEvent(event);
 }
 
 void RenderWidgetHostViewQtDelegateQuick::mouseMoveEvent(QMouseEvent *event)
 {
+    QQuickItem *parent = parentItem();
+    if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+        event->ignore();
+        return;
+    }
     m_client->forwardEvent(event);
 }
 
 void RenderWidgetHostViewQtDelegateQuick::mouseReleaseEvent(QMouseEvent *event)
 {
+    QQuickItem *parent = parentItem();
+    if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+        event->ignore();
+        return;
+    }
     m_client->forwardEvent(event);
 }
 
@@ -254,14 +269,24 @@ void RenderWidgetHostViewQtDelegateQuick::wheelEvent(QWheelEvent *event)
 
 void RenderWidgetHostViewQtDelegateQuick::touchEvent(QTouchEvent *event)
 {
+    QQuickItem *parent = parentItem();
     if (event->type() == QEvent::TouchBegin && !m_isPopup
-            && (parentItem() && parentItem()->property("activeFocusOnPress").toBool()))
+            && (parent && parent->property("activeFocusOnPress").toBool()))
         forceActiveFocus();
+    if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+        event->ignore();
+        return;
+    }
     m_client->forwardEvent(event);
 }
 
 void RenderWidgetHostViewQtDelegateQuick::hoverMoveEvent(QHoverEvent *event)
 {
+    QQuickItem *parent = parentItem();
+    if (parent && !parent->property("activeFocusOnPress").toBool() && !parent->hasActiveFocus()) {
+        event->ignore();
+        return;
+    }
     m_client->forwardEvent(event);
 }