aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/activeFocusOnTab
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-15 15:14:43 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-18 10:20:52 +0000
commitd475ba88cc7e0875cfc30371867d7b82f006770f (patch)
tree5f39644e55b7c4a3d9d5dbe43257378b4eb0f447 /tests/auto/activeFocusOnTab
parentfc9ee5223e2a533abc9e82dbf19253b788ac457b (diff)
tst_activeFocusOnTab: use QStyleHints::setTabFocusBehavior()
Change-Id: I457ffab0dbf351905b2a675a7bf8c8e02ef8283a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'tests/auto/activeFocusOnTab')
-rw-r--r--tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp b/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp
index c618a2d5..951611f2 100644
--- a/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp
+++ b/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp
@@ -60,11 +60,9 @@ private slots:
void allControls();
void textControls();
+
private:
QQmlEngine engine;
- bool qt_tab_all_controls() {
- return QGuiApplication::styleHints()->tabFocusBehavior() == Qt::TabFocusAllControls;
- }
};
tst_activeFocusOnTab::tst_activeFocusOnTab()
@@ -82,8 +80,7 @@ void tst_activeFocusOnTab::cleanup()
void tst_activeFocusOnTab::allControls()
{
- if (!qt_tab_all_controls())
- QSKIP("This platform iterates only text controls. Cannot test iterating all controls.");
+ QGuiApplication::styleHints()->setTabFocusBehavior(Qt::TabFocusAllControls);
QQuickView *window = new QQuickView(0);
window->setBaseSize(QSize(800,600));
@@ -428,12 +425,13 @@ void tst_activeFocusOnTab::allControls()
QVERIFY(item->hasActiveFocus());
delete window;
+
+ QGuiApplication::styleHints()->setTabFocusBehavior(Qt::TabFocusBehavior(-1));
}
void tst_activeFocusOnTab::textControls()
{
- if (qt_tab_all_controls())
- QSKIP("This platform iterates all controls. Cannot test iterating text controls only.");
+ QGuiApplication::styleHints()->setTabFocusBehavior(Qt::TabFocusTextControls);
QQuickView *window = new QQuickView(0);
window->setBaseSize(QSize(800,600));
@@ -487,6 +485,8 @@ void tst_activeFocusOnTab::textControls()
QVERIFY(item->hasActiveFocus());
delete window;
+
+ QGuiApplication::styleHints()->setTabFocusBehavior(Qt::TabFocusBehavior(-1));
}
QTEST_MAIN(tst_activeFocusOnTab)