diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-22 22:36:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 22:53:29 +0200 |
| commit | 85f9ac4a202117cb4dc506cd0696abafe23fb4f1 (patch) | |
| tree | 13faa78c49b4ba8436e45af07cee3d126301a55a /src/quick/items/qquickitem.cpp | |
| parent | 9213d031980d32f25468eeb9177d6f403060bf00 (diff) | |
| parent | fb0b6399afdd39ab2240801c839c06ea70a22c4b (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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 1585b1e6dd..a20326a8e7 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; @@ -7359,7 +7364,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 |