From 9d4c6278217fecefa15c52073f8de0e6f0e7700d Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 10 Oct 2015 21:18:18 +0200 Subject: Clarify tst_activeFocusOnTab Change-Id: Ida63be2939e10da0780f34807e449550ea6a5155 Reviewed-by: Liang Qi --- tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp b/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp index b0fbf597..79532b45 100644 --- a/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp +++ b/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp @@ -58,11 +58,11 @@ private slots: void initTestCase(); void cleanup(); - void activeFocusOnTab(); - void activeFocusOnTab2(); + void allControls(); + void textControls(); private: QQmlEngine engine; - bool qt_tab_all_widgets() { + bool qt_tab_all_controls() { return QGuiApplication::styleHints()->tabFocusBehavior() == Qt::TabFocusAllControls; } }; @@ -80,10 +80,10 @@ void tst_activeFocusOnTab::cleanup() { } -void tst_activeFocusOnTab::activeFocusOnTab() +void tst_activeFocusOnTab::allControls() { - if (!qt_tab_all_widgets()) - QSKIP("This function doesn't support NOT iterating all."); + if (!qt_tab_all_controls()) + QSKIP("This platform iterates only text controls. Cannot test iterating all controls."); QQuickView *window = new QQuickView(0); window->setBaseSize(QSize(800,600)); @@ -372,10 +372,10 @@ void tst_activeFocusOnTab::activeFocusOnTab() delete window; } -void tst_activeFocusOnTab::activeFocusOnTab2() +void tst_activeFocusOnTab::textControls() { - if (qt_tab_all_widgets()) - QSKIP("This function doesn't support iterating all."); + if (qt_tab_all_controls()) + QSKIP("This platform iterates all controls. Cannot test iterating text controls only."); QQuickView *window = new QQuickView(0); window->setBaseSize(QSize(800,600)); -- cgit v1.2.3