diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-02-04 10:10:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-02-12 18:50:03 +0000 |
| commit | 1468d30fa386028f229a1edf4b00b6a159aac829 (patch) | |
| tree | a587840db2f44ed554eb0b1f15fb90fca59c8ac5 /src/quick/items | |
| parent | 67d3e3d6d53bb1762ce91912eff0471fa55d4676 (diff) | |
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>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 13 | ||||
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 1 |
2 files changed, 2 insertions, 12 deletions
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> @@ -2292,16 +2293,6 @@ QQuickItem::~QQuickItem() /*! \internal */ -bool QQuickItemPrivate::qt_tab_all_widgets() -{ - if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) - return theme->themeHint(QPlatformTheme::TabAllWidgets).toBool(); - return true; -} - -/*! - \internal -*/ bool QQuickItemPrivate::canAcceptTabFocus(QQuickItem *item) { if (!item->window()) @@ -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) { diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 038d001bf4..f2ad487a0b 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -492,7 +492,6 @@ public: static bool focusNextPrev(QQuickItem *item, bool forward); static QQuickItem *nextPrevItemInTabFocusChain(QQuickItem *item, bool forward); - static bool qt_tab_all_widgets(); //todo: move to QGuiApplication? static bool canAcceptTabFocus(QQuickItem *item); qreal x; |