diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-09 16:03:09 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-09 16:04:02 +0200 |
commit | b697f511ab226079c161ea68c18ac85c5533d3cc (patch) | |
tree | 707be29e37af5cbcc1c12d0a3d1cf67078e79b5f /src/quick | |
parent | 1484039a77d86504901e82b18582d908648b8d35 (diff) | |
parent | 6f59c91c51edd7207635c3fa2f0b2b1179e7aa6e (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.7
Change-Id: I6648a0ce49e0fd2b0881444bd38b9a10c093dc18
Diffstat (limited to 'src/quick')
-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 38d070831c..0edbcd8780 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2645,7 +2645,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; |