From 1468d30fa386028f229a1edf4b00b6a159aac829 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
Date: Wed, 4 Feb 2015 10:10:12 +0100
Subject: Use TabFocusBehavior in QStyleHints in QtQuick

* QQuickItemPrivate::qt_tab_all_widgets was removed.
* qt_tab_all_widgets in test was updated.

Change-Id: I418d7a3edae0a4782a91289f6c0494ff5874d071
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
---
 src/quick/items/qquickitem.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/quick/items/qquickitem.cpp')

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 3eaf2f681b..b1aeda4091 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -46,6 +46,7 @@
 #include <QtQml/qqmlinfo.h>
 #include <QtGui/qpen.h>
 #include <QtGui/qguiapplication.h>
+#include <QtGui/qstylehints.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/qinputmethod.h>
 #include <QtCore/qdebug.h>
@@ -2289,16 +2290,6 @@ QQuickItem::~QQuickItem()
     delete d->_stateGroup; d->_stateGroup = 0;
 }
 
-/*!
-    \internal
-*/
-bool QQuickItemPrivate::qt_tab_all_widgets()
-{
-    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme())
-        return theme->themeHint(QPlatformTheme::TabAllWidgets).toBool();
-    return true;
-}
-
 /*!
     \internal
 */
@@ -2364,7 +2355,7 @@ QQuickItem* QQuickItemPrivate::nextPrevItemInTabFocusChain(QQuickItem *item, boo
     if (!contentItem)
         return item;
 
-    bool all = QQuickItemPrivate::qt_tab_all_widgets();
+    bool all = QGuiApplication::styleHints()->tabFocusBehavior() == Qt::TabFocusAllControls;
 
     QQuickItem *from = 0;
     if (forward) {
-- 
cgit v1.2.3