From 986526d875e5188016ff4292126fe29755ead634 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 19 Sep 2013 13:13:49 +0200 Subject: 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 --- src/quick/items/qquickitem.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/quick/items/qquickitem.cpp') 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; -- cgit v1.2.3 From 387e8720fcbc60cd1798c9356a91d88077569c72 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 20 Sep 2013 22:30:50 +0200 Subject: Docs: fix QtQuick2::Item::layer.sourceRect type Change-Id: Ia02f451b07638ec2e3f0355b89bf9f7356da44a6 Reviewed-by: Gunnar Sletta --- src/quick/items/qquickitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quick/items/qquickitem.cpp') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 3591560d69..811a728fb6 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -7348,7 +7348,7 @@ void QQuickItemLayer::setFormat(QQuickShaderEffectSource::Format f) /*! - \qmlproperty enumeration QtQuick2::Item::layer.sourceRect + \qmlproperty rect QtQuick2::Item::layer.sourceRect This property defines the rectangular area of the item that should be rendered into the texture. The source rectangle can be larger than -- cgit v1.2.3