diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-20 12:21:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-20 12:44:46 +0000 |
| commit | d68a7e04f2a0c01e087190a6171e7c37ffb0359d (patch) | |
| tree | 82d2c07cf03d2cda15ebbaaef422fdef6923ff2a /src | |
| parent | a28bf00a6c1faa550602b8d5b80de5e3ff79a0c0 (diff) | |
QQuickItem: fix an infinite loop nextItemInFocusChain()
When isTabFence is set to true and no children.
Task-number: QTBUG-50516
Change-Id: I8430336fde7ab041797f8f9d9dfe5b9d56fecddd
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 224decefec..059bb4beb1 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2508,6 +2508,8 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo lastChild = prevTabChildItem(current, -1); } bool isTabFence = current->d_func()->isTabFence; + if (isTabFence && !hasChildren) + return current; // coming from parent: check children if (hasChildren && from == current->parentItem()) { |