diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-22 22:36:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 22:53:29 +0200 |
| commit | 85f9ac4a202117cb4dc506cd0696abafe23fb4f1 (patch) | |
| tree | 13faa78c49b4ba8436e45af07cee3d126301a55a /tests | |
| parent | 9213d031980d32f25468eeb9177d6f403060bf00 (diff) | |
| parent | fb0b6399afdd39ab2240801c839c06ea70a22c4b (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickitem2/data/nextItemInFocusChain3.qml | 7 | ||||
| -rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 13 |
2 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickitem2/data/nextItemInFocusChain3.qml b/tests/auto/quick/qquickitem2/data/nextItemInFocusChain3.qml new file mode 100644 index 0000000000..4781469cb1 --- /dev/null +++ b/tests/auto/quick/qquickitem2/data/nextItemInFocusChain3.qml @@ -0,0 +1,7 @@ +import QtQuick 2.1 + +Rectangle { + width: 360 + height: 360 + Component.onCompleted: nextItemInFocusChain(); +} diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index d15a46feca..c451ea5e0a 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -76,6 +76,7 @@ private slots: void nextItemInFocusChain(); void nextItemInFocusChain2(); + void nextItemInFocusChain3(); void keys(); void standardKeys_data(); @@ -960,6 +961,18 @@ void tst_QQuickItem::nextItemInFocusChain2() delete window; } +void tst_QQuickItem::nextItemInFocusChain3() +{ + QQuickView *window = new QQuickView(0); + window->setBaseSize(QSize(800,600)); + + window->setSource(testFileUrl("nextItemInFocusChain3.qml")); + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QGuiApplication::focusWindow() == window); +} + void tst_QQuickItem::keys() { QQuickView *window = new QQuickView(0); |