From 6e32c7311b1690d36023caa688823944551a697c Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@digia.com>
Date: Wed, 15 May 2013 05:18:59 -0700
Subject: 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>
---
 src/quick/items/qquickitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/quick/items')

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;
         }
-- 
cgit v1.2.3