Merge remote-tracking branch 'origin/master' into api_changes

Change-Id: Ibcb1f7070f50968b77b66112750ce5c70fc0b6d0

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 90c96b4030..f4556f7e32 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -64,6 +64,8 @@ private slots:
     void touchCancelWithTouchToMouse();
     void orientation();
     void close();
+    void activateAndClose();
+
     void initTestCase()
     {
         touchDevice = new QTouchDevice;
@@ -632,5 +634,16 @@ void tst_QWindow::close()
     QVERIFY(b.close());
 }
 
+void tst_QWindow::activateAndClose()
+{
+    for (int i = 0; i < 10; ++i)  {
+       QWindow window;
+       window.show();
+       QTest::qWaitForWindowShown(&window);
+       window.requestActivateWindow();
+       QTRY_COMPARE(qGuiApp->focusWindow(), &window);
+    }
+}
+
 #include <tst_qwindow.moc>
 QTEST_MAIN(tst_QWindow);