diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-25 19:28:36 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-25 19:49:47 +0000 |
commit | 46215a8bcc4423fe79be4e4830435a1e10db22e7 (patch) | |
tree | 319cad15d62597bea6f626ad1ade7774fb864e62 /tests/auto/activeFocusOnTab | |
parent | d703de8752e07cb12e8ce2e2a05d608f2b26425a (diff) |
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 <liang.qi@theqtcompany.com>
Diffstat (limited to 'tests/auto/activeFocusOnTab')
-rw-r--r-- | tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml | 5 | ||||
-rw-r--r-- | tests/auto/activeFocusOnTab/tst_activeFocusOnTab.cpp | 22 |
2 files changed, 2 insertions, 25 deletions
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<QQuickItem>(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<QQuickItem>(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()); |