diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-11 12:35:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-17 13:52:16 +0100 |
| commit | 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763 (patch) | |
| tree | a7f63b2d60d18b17ba3b809691eae3b695cd6bc4 /tests/auto/quick/qquickitem/tst_qquickitem.cpp | |
| parent | 1030d18e0aa39676de448a8553f22df8303b6f76 (diff) | |
Do not force focus for non-focused windows.
If a QQuickWindow comes to screen but is not the focus window,
such as if it is a child window of another window, it should
not have focus by default.
Change-Id: If9015bbc179bb101178b3bc8de176a1c71c46023
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'tests/auto/quick/qquickitem/tst_qquickitem.cpp')
| -rw-r--r-- | tests/auto/quick/qquickitem/tst_qquickitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp index 6209f412c3..851ff88c64 100644 --- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp @@ -732,7 +732,7 @@ void tst_qquickitem::focusSubItemInNonFocusScope() QQuickView *view = new QQuickView; view->setSource(testFileUrl("focusSubItemInNonFocusScope.qml")); view->show(); - qApp->processEvents(); + QTest::qWaitForWindowActive(view); QQuickItem *dummyItem = view->rootObject()->findChild<QQuickItem *>("dummyItem"); QVERIFY(dummyItem); |