aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-22 12:57:09 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-22 16:52:01 +0000
commitdeecd627f425db37b41173798cb8c42dfb17fe03 (patch)
tree96078bef12439459f95e09b7ba5c0104b696216a /src
parent1de9e13594b9c4839eff0205312db133cef08676 (diff)
ComboBox: use Qt::StrongFocus focus policy
Change-Id: Ia0fa2d6497e4fbf9124ab8e063c4e0b5135189c0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/templates/qquickcombobox.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/templates/qquickcombobox.cpp b/src/templates/qquickcombobox.cpp
index 210239b0..c4e38ec2 100644
--- a/src/templates/qquickcombobox.cpp
+++ b/src/templates/qquickcombobox.cpp
@@ -349,7 +349,7 @@ void QQuickComboBoxPrivate::createDelegateModel()
QQuickComboBox::QQuickComboBox(QQuickItem *parent) :
QQuickControl(*(new QQuickComboBoxPrivate), parent)
{
- setActiveFocusOnTab(true);
+ setFocusPolicy(Qt::StrongFocus);
setFlag(QQuickItem::ItemIsFocusScope);
setAcceptedMouseButtons(Qt::LeftButton);
}
@@ -796,8 +796,6 @@ void QQuickComboBox::mouseReleaseEvent(QMouseEvent *event)
QQuickControl::mouseReleaseEvent(event);
if (d->pressed) {
setPressed(false);
- if (!d->isPopupVisible())
- forceActiveFocus(Qt::MouseFocusReason);
d->togglePopup(false);
}
}