diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-10-28 16:15:38 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 05:13:05 +0100 |
| commit | 2a40fa8d3cd40bdce7d8771a15497fd75ee12f52 (patch) | |
| tree | 33340afb63d5f491c446a66de27741cf281395aa /tests/auto | |
| parent | 6013a61effd7517f4d659902391f89bee29ec3fe (diff) | |
Workaround windows not gaining focus on mac.
Delaying giving focus to the rootItem until the canvas window gains
focus doesn't work if the window never gains focus. So give focus to
the rootItem immediately so text input continues to work while
QTBUG-22415 is being resolved.
Task-number: QTBUG-22409
Change-Id: I1bdb13485219d0c2a2f8bdcb3e0972444e3813f2
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp index ffb9660262..d0149ed1d6 100644 --- a/tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp +++ b/tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp @@ -557,6 +557,7 @@ void tst_qquickfocusscope::canvasFocus() QSignalSpy scope2ActiveFocusSpy(scope2, SIGNAL(activeFocusChanged(bool))); QSignalSpy item2ActiveFocusSpy(item2, SIGNAL(activeFocusChanged(bool))); + QEXPECT_FAIL("", "QTBUG-22415", Abort); QCOMPARE(rootItem->hasFocus(), false); QCOMPARE(rootItem->hasActiveFocus(), false); QCOMPARE(scope1->hasFocus(), true); @@ -585,6 +586,7 @@ void tst_qquickfocusscope::canvasFocus() QCOMPARE(scope2->hasActiveFocus(), false); QCOMPARE(item2->hasFocus(), false); QCOMPARE(item2->hasActiveFocus(), false); + QCOMPARE(rootFocusSpy.count(), 1); QCOMPARE(rootActiveFocusSpy.count(), 1); QCOMPARE(scope1FocusSpy.count(), 0); @@ -605,6 +607,7 @@ void tst_qquickfocusscope::canvasFocus() QCOMPARE(scope1->hasActiveFocus(), false); QCOMPARE(item1->hasFocus(), true); QCOMPARE(item1->hasActiveFocus(), false); + QCOMPARE(rootFocusSpy.count(), 2); QCOMPARE(rootActiveFocusSpy.count(), 2); QCOMPARE(scope1FocusSpy.count(), 0); @@ -612,6 +615,7 @@ void tst_qquickfocusscope::canvasFocus() QCOMPARE(item1FocusSpy.count(), 0); QCOMPARE(item1ActiveFocusSpy.count(), 2); + // canvas does not have focus, so item2 will not get active focus item2->forceActiveFocus(); |