diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-05-03 16:22:48 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-05-04 22:19:28 +0000 |
| commit | 1372a773e1acc88d454beab850a6e88c4c359d7b (patch) | |
| tree | 63418640e6549ff9b78cb3051d0c5c3e2ebeb5d8 | |
| parent | 9530a6a8744e9eb2b4ed947b528ab7c51d8c360f (diff) | |
QQuickItem: force clear subFocusItem from ancestors
Make sure ancestor items don't end up with dangling subFocusItem
pointers.
Change-Id: I79015abe8215b807b02577c25de58c44bfc70f9e
Task-number: QTBUG-51080
Reviewed-by: Liang Qi <liang.qi@qt.io>
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index c27e9d0d95..e963f91961 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2639,7 +2639,7 @@ void QQuickItem::setParentItem(QQuickItem *parentItem) QQuickItem *scopeItem = 0; - if (hasFocus()) + if (hasFocus() || op->subFocusItem == this) scopeFocusedItem = this; else if (!isFocusScope() && d->subFocusItem) scopeFocusedItem = d->subFocusItem; |