diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 18:14:10 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 18:14:10 +0200 |
| commit | fb0b6399afdd39ab2240801c839c06ea70a22c4b (patch) | |
| tree | fc51548845796d21b56562109c9a0332be19035e /src/quick/items/qquickitem.cpp | |
| parent | 0fc040ef70513ccaeb9e96f7ca05a3df4d6c7879 (diff) | |
| parent | 387e8720fcbc60cd1798c9356a91d88077569c72 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I899f3b517523e4037de50802c0912f7dd960133e
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 98a87a4bcf..ccad88a2e6 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2101,6 +2101,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; @@ -2113,7 +2119,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; @@ -7351,7 +7356,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 |