Fix item focus following canvas focus.

Restore canvas focus handling so that active item focus is added and
removed as  the canvas focus changes.

Task-number: QTBUG-17320
Change-Id: Ief60f35da2f3a563f397ce026ca6fea289a200c4
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 6 insertions, 18 deletions

diff --git a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp
index 8c8166b2f1..23224d0452 100644
--- a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp
@@ -1798,30 +1798,18 @@ void tst_qquicktextinput::cursorVisible()
     QCOMPARE(input.isCursorVisible(), true);
     QCOMPARE(spy.count(), 5);
 
-    view.setWindowState(Qt::WindowNoState);
-    QEXPECT_FAIL("", "Most likely a side-effect of QTBUG-21489", Abort);
+    QQuickView alternateView;
+    alternateView.show();
+    alternateView.requestActivateWindow();
+    QTest::qWaitForWindowShown(&alternateView);
+
     QCOMPARE(input.isCursorVisible(), false);
     QCOMPARE(spy.count(), 6);
 
     view.requestActivateWindow();
+    QTest::qWaitForWindowShown(&view);
     QCOMPARE(input.isCursorVisible(), true);
     QCOMPARE(spy.count(), 7);
-
-    // on mac, setActiveWindow(0) on mac does not deactivate the current application
-    // (you have to switch to a different app or hide the current app to trigger this)
-#if !defined(Q_WS_MAC)
-    // QGuiApplication has no equivalent of setActiveWindow(0).  Is this different to clearing the
-    // active state of the window or can it be removed?
-//    QApplication::setActiveWindow(0);
-//    QTRY_COMPARE(QApplication::focusWindow(), static_cast<QWidget *>(0));
-//    QCOMPARE(input.isCursorVisible(), false);
-//    QCOMPARE(spy.count(), 8);
-
-//    view.requestActivateWindow();
-//    QTRY_COMPARE(view.windowState(), Qt::WindowActive);
-//    QCOMPARE(input.isCursorVisible(), true);
-//    QCOMPARE(spy.count(), 9);
-#endif
 }
 
 void tst_qquicktextinput::cursorRectangle()