diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-02 12:30:57 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-02 12:48:21 +0000 |
| commit | 2069f1cae020113306f150309fb55de1c478ea59 (patch) | |
| tree | bff9fe1761706a1b9d3804892ed327dbc7cc699a /src | |
| parent | 30bfa894d977e42d16d0ad88a023681818a11dc8 (diff) | |
Fix QQuickControl::setFocusReason()
There is a little behavior change in focus handling in Qt Quick after
qdeclarative commit e7da97b. The order of QQuickItem::focusOutEvent()
and QQuickItem::ItemActiveFocusHasChanged have changed. Now we need to
emit visualFocusChanged() in setFocusReason() when losing visual focus
to ensure that bindigs to visualFocus get re-evaluated as appropriate.
Change-Id: I52e728c7df751a54b36f353415b2666cfedc73ad
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 518255dd..d571a2d4 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -902,7 +902,7 @@ void QQuickControl::setFocusReason(Qt::FocusReason reason) Qt::FocusReason oldReason = d->focusReason; d->focusReason = reason; emit focusReasonChanged(); - if (d->activeFocus && isKeyFocusReason(oldReason) != isKeyFocusReason(reason)) + if (isKeyFocusReason(oldReason) != isKeyFocusReason(reason)) emit visualFocusChanged(); } |