Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl

Change-Id: Ia55f51bc5a14b1b9f55e1ae4123f52d779e24e94

1 files changed, 5 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index ea8d3d1d..b715659f 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -1740,7 +1740,11 @@ void QQuickComboBox::focusInEvent(QFocusEvent *event)
 {
     Q_D(QQuickComboBox);
     QQuickControl::focusInEvent(event);
-    if (d->contentItem && isEditable())
+    // Setting focus on TextField should not be done when drop down indicator was clicked
+    // That is why, if focus is not set with key reason, it should not be passed to textEdit by default.
+    // Focus on Edit Text should be set only intentionally by user.
+    if ((event->reason() == Qt::TabFocusReason || event->reason() == Qt::BacktabFocusReason ||
+            event->reason() == Qt::ShortcutFocusReason) && d->contentItem && isEditable())
         d->contentItem->forceActiveFocus(event->reason());
 }