Fix a warning when setActiveFocusOnTab(false) for root item
authorLiang Qi <liang.qi@digia.com>
Wed, 15 May 2013 12:18:59 +0000 (05:18 -0700)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 17 May 2013 16:37:18 +0000 (18:37 +0200)
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>
src/quick/items/qquickitem.cpp

index 1667736..d6a663a 100644 (file)
@@ -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;
         }