diff options
| author | Liang Qi <liang.qi@digia.com> | 2013-05-15 05:18:59 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-17 18:37:18 +0200 |
| commit | 6e32c7311b1690d36023caa688823944551a697c (patch) | |
| tree | 37f8401836288252ea70833173c9c562598572f3 /src/quick | |
| parent | 1ead0de195cdc3525759bb1a7465201ad438f95e (diff) | |
Fix a warning when setActiveFocusOnTab(false) for root item
Task-number: QTBUG-31114
Change-Id: I4d6aac534fbc1e84593e4d7084e6a892eea4256c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 1667736d46..d6a663ab77 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -5591,7 +5591,7 @@ void QQuickItem::setActiveFocusOnTab(bool activeFocusOnTab) return; if (window()) { - if ((this == window()->activeFocusItem()) && !activeFocusOnTab) { + if ((this == window()->activeFocusItem()) && this != window()->contentItem() && !activeFocusOnTab) { qWarning("QQuickItem: Cannot set activeFocusOnTab to false once item is the active focus item."); return; } |