diff options
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index a5f8996bf5..3591560d69 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2097,6 +2097,12 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo { Q_ASSERT(item); + if (!item->window()) + return item; + const QQuickItem * const contentItem = item->window()->contentItem(); + if (!contentItem) + return item; + bool all = QQuickItemPrivate::qt_tab_all_widgets(); QQuickItem *from = 0; @@ -2109,7 +2115,6 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo from = item->parentItem(); } bool skip = false; - const QQuickItem * const contentItem = item->window()->contentItem(); const QQuickItem * const originalItem = item; QQuickItem * startItem = item; QQuickItem * firstFromItem = from; |