From 46215a8bcc4423fe79be4e4830435a1e10db22e7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 25 Sep 2015 19:28:36 +0200 Subject: Remove ToggleButton We don't have a sensible design. It's better not to have it at all than to have a confusing tiny bit tweaked clone of Switch. Change-Id: Ib0eabd075590100e9e49846c7172909525b54a57 Reviewed-by: Liang Qi --- .../activeFocusOnTab/data/activeFocusOnTab.qml | 5 ----- .../auto/activeFocusOnTab/tst_activeFocusOnTab.cpp | 22 ++-------------------- 2 files changed, 2 insertions(+), 25 deletions(-) (limited to 'tests/auto/activeFocusOnTab') diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml index 92a90127..dd2281dd 100644 --- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml +++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml @@ -163,11 +163,6 @@ Item { objectName: "textfield" text: "abc" } - ToggleButton { - id: togglebutton - objectName: "togglebutton" - text: "togglebutton" - } ToolBar { width: parent.width id: toolbar diff --git a/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp b/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp index 8ac756b9..b0fbf597 100644 --- a/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp +++ b/tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp @@ -207,16 +207,7 @@ void tst_activeFocusOnTab::activeFocusOnTab() QVERIFY(item); QVERIFY(item->hasActiveFocus()); - // Tab: textfield->togglebutton - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - - item = findItem(window->rootObject(), "togglebutton"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); - - // Tab: togglebutton->toolbutton + // Tab: textfield->toolbutton key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); QGuiApplication::sendEvent(window, &key); QVERIFY(key.isAccepted()); @@ -243,16 +234,7 @@ void tst_activeFocusOnTab::activeFocusOnTab() QVERIFY(item); QVERIFY(item->hasActiveFocus()); - // BackTab: toolbutton->togglebutton - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - - item = findItem(window->rootObject(), "togglebutton"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); - - // BackTab: togglebutton->textfield + // BackTab: toolbutton->textfield key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); QGuiApplication::sendEvent(window, &key); QVERIFY(key.isAccepted()); -- cgit v1.2.3