diff options
| author | Liang Qi <liang.qi@digia.com> | 2013-09-19 13:13:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 14:28:23 +0200 |
| commit | 986526d875e5188016ff4292126fe29755ead634 (patch) | |
| tree | 5995fec0a9144bdc94e88741123dd6f392326b48 /src/quick/items/qquickitem.cpp | |
| parent | 52eb21be3dd3a76d018b5b86a8d72d68accb924a (diff) | |
Fix a crash in QQuickItem::nextItemInFocusChain()
There is no window object yet when Component.onCompleted.
Task-number: QTBUG-33298
Change-Id: I0608d52ee9fe52a0e2c18e81ad7ba99b56078be4
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
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; |