diff options
author | Liang Qi <liang.qi@digia.com> | 2013-05-08 17:53:34 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 19:27:41 +0200 |
commit | 98229432d781253201699a04e606414767d5f2e6 (patch) | |
tree | 6b59c69701c861298d324a2deb88e2d6eb7e51ed /tests/auto/quick/qquickitem2/tst_qquickitem.cpp | |
parent | 06385e88556985cfd1309f1c29f261be6f6a4c74 (diff) |
Revert "Mac: respect the system settings in Full Keyboard Access"
This breaks Qt Quick Controls activeFocusOnTab autotests.
This reverts commit 305616a60462b668c4d0b3d19302fa90469aceb5.
Change-Id: Ided59ebe99659b23e950e8269ccaa8d7d44a4fdb
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests/auto/quick/qquickitem2/tst_qquickitem.cpp')
-rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 132 |
1 files changed, 0 insertions, 132 deletions
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 9a6bed6dbe..6b73f52593 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -47,7 +47,6 @@ #include <QtGui/private/qinputmethod_p.h> #include <QtQuick/private/qquickrectangle_p.h> #include <QtQuick/private/qquicktextinput_p.h> -#include <QtGui/qpa/qplatformtheme.h> #include <private/qquickitem_p.h> #include "../../shared/util.h" #include "../shared/visualtestutil.h" @@ -70,10 +69,8 @@ private slots: void activeFocusOnTab3(); void activeFocusOnTab4(); void activeFocusOnTab5(); - void activeFocusOnTab6(); void nextItemInFocusChain(); - void nextItemInFocusChain2(); void keys(); void keysProcessingOrder(); @@ -113,11 +110,6 @@ private slots: private: QQmlEngine engine; - bool qt_tab_all_widgets() { - if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) - return theme->themeHint(QPlatformTheme::TabAllWidgets).toBool(); - return true; - } }; class KeysTestObject : public QObject @@ -291,9 +283,6 @@ void tst_QQuickItem::cleanup() void tst_QQuickItem::activeFocusOnTab() { - if (!qt_tab_all_widgets()) - QSKIP("This function doesn't support NOT iterating all."); - QQuickView *window = new QQuickView(0); window->setBaseSize(QSize(800,600)); @@ -403,9 +392,6 @@ void tst_QQuickItem::activeFocusOnTab() void tst_QQuickItem::activeFocusOnTab2() { - if (!qt_tab_all_widgets()) - QSKIP("This function doesn't support NOT iterating all."); - QQuickView *window = new QQuickView(0); window->setBaseSize(QSize(800,600)); @@ -443,9 +429,6 @@ void tst_QQuickItem::activeFocusOnTab2() void tst_QQuickItem::activeFocusOnTab3() { - if (!qt_tab_all_widgets()) - QSKIP("This function doesn't support NOT iterating all."); - QQuickView *window = new QQuickView(0); window->setBaseSize(QSize(800,600)); @@ -625,9 +608,6 @@ void tst_QQuickItem::activeFocusOnTab3() void tst_QQuickItem::activeFocusOnTab4() { - if (!qt_tab_all_widgets()) - QSKIP("This function doesn't support NOT iterating all."); - QQuickView *window = new QQuickView(0); window->setBaseSize(QSize(800,600)); @@ -657,9 +637,6 @@ void tst_QQuickItem::activeFocusOnTab4() void tst_QQuickItem::activeFocusOnTab5() { - if (!qt_tab_all_widgets()) - QSKIP("This function doesn't support NOT iterating all."); - QQuickView *window = new QQuickView(0); window->setBaseSize(QSize(800,600)); @@ -689,69 +666,8 @@ void tst_QQuickItem::activeFocusOnTab5() delete window; } -void tst_QQuickItem::activeFocusOnTab6() -{ - if (qt_tab_all_widgets()) - QSKIP("This function doesn't support iterating all."); - - QQuickView *window = new QQuickView(0); - window->setBaseSize(QSize(800,600)); - - window->setSource(testFileUrl("activeFocusOnTab6.qml")); - window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); - QVERIFY(QGuiApplication::focusWindow() == window); - - // original: button12 - QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "button12"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); - - // Tab: button12->edit - QKeyEvent key(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - - item = findItem<QQuickItem>(window->rootObject(), "edit"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); - - // BackTab: edit->button12 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - - item = findItem<QQuickItem>(window->rootObject(), "button12"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); - - // BackTab: button12->button11 - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - - item = findItem<QQuickItem>(window->rootObject(), "button11"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); - - // BackTab: button11->edit - key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier, "", false, 1); - QGuiApplication::sendEvent(window, &key); - QVERIFY(key.isAccepted()); - - item = findItem<QQuickItem>(window->rootObject(), "edit"); - QVERIFY(item); - QVERIFY(item->hasActiveFocus()); - - delete window; -} - void tst_QQuickItem::nextItemInFocusChain() { - if (!qt_tab_all_widgets()) - QSKIP("This function doesn't support NOT iterating all."); - QQuickView *window = new QQuickView(0); window->setBaseSize(QSize(800,600)); @@ -823,54 +739,6 @@ void tst_QQuickItem::nextItemInFocusChain() delete window; } -void tst_QQuickItem::nextItemInFocusChain2() -{ - if (qt_tab_all_widgets()) - QSKIP("This function doesn't support iterating all."); - - QQuickView *window = new QQuickView(0); - window->setBaseSize(QSize(800,600)); - - window->setSource(testFileUrl("activeFocusOnTab6.qml")); - window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); - QVERIFY(QGuiApplication::focusWindow() == window); - - QQuickItem *button11 = findItem<QQuickItem>(window->rootObject(), "button11"); - QVERIFY(button11); - QQuickItem *button12 = findItem<QQuickItem>(window->rootObject(), "button12"); - QVERIFY(button12); - - QQuickItem *edit = findItem<QQuickItem>(window->rootObject(), "edit"); - QVERIFY(edit); - - QQuickItem *next, *prev; - - next = button11->nextItemInFocusChain(true); - QVERIFY(next); - QCOMPARE(next, button12); - prev = button11->nextItemInFocusChain(false); - QVERIFY(prev); - QCOMPARE(prev, edit); - - next = button12->nextItemInFocusChain(); - QVERIFY(next); - QCOMPARE(next, edit); - prev = button12->nextItemInFocusChain(false); - QVERIFY(prev); - QCOMPARE(prev, button11); - - next = edit->nextItemInFocusChain(); - QVERIFY(next); - QCOMPARE(next, button11); - prev = edit->nextItemInFocusChain(false); - QVERIFY(prev); - QCOMPARE(prev, button12); - - delete window; -} - void tst_QQuickItem::keys() { QQuickView *window = new QQuickView(0); |