2 files changed, 149 insertions, 0 deletions
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index eea72cd246..e1cdb8db45 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -48,6 +48,10 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <qgenericplugin.h>
 
+#if defined(Q_OS_QNX)
+#include <QOpenGLContext>
+#endif
+
 #include <QDebug>
 
 #include "tst_qcoreapplication.h"
@@ -143,6 +147,9 @@ void tst_QGuiApplication::focusObject()
     const QRect screenGeometry = QGuiApplication::primaryScreen()->availableVirtualGeometry();
 
     DummyWindow window1;
+#if defined(Q_OS_QNX)
+    window1.setSurfaceType(QSurface::OpenGLSurface);
+#endif
     window1.resize(windowSize, windowSize);
     window1.setTitle(QStringLiteral("focusObject:window1"));
     window1.setFramePosition(QPoint(screenGeometry.left() + spacing, screenGeometry.top() + spacing));
@@ -153,6 +160,15 @@ void tst_QGuiApplication::focusObject()
 
     window1.show();
 
+#if defined(Q_OS_QNX) // We either need to create a eglSurface or a create a backing store
+                      // and then post the window in order for screen to show the window
+    QOpenGLContext context;
+    context.create();
+    context.makeCurrent(&window1);
+    QTest::qWaitForWindowExposed(&window1); // Buffer swap only succeeds with exposed window
+    context.swapBuffers(&window1);
+#endif
+
     QSignalSpy spy(&app, SIGNAL(focusObjectChanged(QObject*)));
 
 
@@ -298,15 +314,35 @@ void tst_QGuiApplication::changeFocusWindow()
 
     // focus is changed between FocusAboutToChange and FocusChanged
     FocusChangeWindow window1;
+#if defined(Q_OS_QNX)
+    window1.setSurfaceType(QSurface::OpenGLSurface);
+#endif
     window1.resize(windowSize, windowSize);
     window1.setFramePosition(QPoint(screenGeometry.left() + spacing, screenGeometry.top() + spacing));
     window1.setTitle(QStringLiteral("changeFocusWindow:window1"));
     window1.show();
+#if defined(Q_OS_QNX) // We either need to create a eglSurface or a create a backing store
+                      // and then post the window in order for screen to show the window
+    QOpenGLContext context;
+    context.create();
+    context.makeCurrent(&window1);
+    QTest::qWaitForWindowExposed(&window1); // Buffer swap only succeeds with exposed window
+    context.swapBuffers(&window1);
+#endif
     FocusChangeWindow window2;
+#if defined(Q_OS_QNX)
+    window2.setSurfaceType(QSurface::OpenGLSurface);
+#endif
     window2.resize(windowSize, windowSize);
     window2.setFramePosition(QPoint(screenGeometry.left() + 2 * spacing + windowSize, screenGeometry.top() + spacing));
     window2.setTitle(QStringLiteral("changeFocusWindow:window2"));
     window2.show();
+#if defined(Q_OS_QNX) // We either need to create a eglSurface or a create a backing store
+                      // and then post the window in order for screen to show the window
+    context.makeCurrent(&window2);
+    QTest::qWaitForWindowExposed(&window2); // Buffer swap only succeeds with exposed window
+    context.swapBuffers(&window2);
+#endif
     QVERIFY(QTest::qWaitForWindowExposed(&window1));
     QVERIFY(QTest::qWaitForWindowExposed(&window2));
     window1.requestActivate();
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index eefa85a745..589f3e66e1 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -88,6 +88,10 @@ private slots:
     void visibility();
     void mask();
     void initialSize();
+    void modalDialog();
+    void modalDialogClosingOneOfTwoModal();
+    void modalWithChildWindow();
+    void modalWindowModallity();
 
     void initTestCase()
     {
@@ -1316,6 +1320,115 @@ void tst_QWindow::initialSize()
     }
 }
 
+void tst_QWindow::modalDialog()
+{
+    QWindow normalWindow;
+    normalWindow.resize(400, 400);
+    normalWindow.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&normalWindow));
+
+    QWindow dialog;
+    dialog.resize(200,200);
+    dialog.setModality(Qt::ApplicationModal);
+    dialog.setFlags(Qt::Dialog);
+    dialog.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&dialog));
+
+    normalWindow.requestActivate();
+
+    QGuiApplication::sync();
+    QGuiApplication::processEvents();
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &dialog);
+}
+
+void tst_QWindow::modalDialogClosingOneOfTwoModal()
+{
+    QWindow normalWindow;
+    normalWindow.resize(400, 400);
+    normalWindow.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&normalWindow));
+
+    QWindow first_dialog;
+    first_dialog.resize(200,200);
+    first_dialog.setModality(Qt::ApplicationModal);
+    first_dialog.setFlags(Qt::Dialog);
+    first_dialog.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&first_dialog));
+
+    {
+        QWindow second_dialog;
+        second_dialog.resize(200,200);
+        second_dialog.setModality(Qt::ApplicationModal);
+        second_dialog.setFlags(Qt::Dialog);
+        second_dialog.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&second_dialog));
+
+        QTRY_COMPARE(QGuiApplication::focusWindow(), &second_dialog);
+
+        second_dialog.close();
+    }
+
+    QGuiApplication::sync();
+    QGuiApplication::processEvents();
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &first_dialog);
+}
+
+void tst_QWindow::modalWithChildWindow()
+{
+    QWindow normalWindow;
+    normalWindow.resize(400, 400);
+    normalWindow.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&normalWindow));
+
+    QWindow tlw_dialog;
+    tlw_dialog.resize(400,200);
+    tlw_dialog.setModality(Qt::ApplicationModal);
+    tlw_dialog.setFlags(Qt::Dialog);
+    tlw_dialog.create();
+
+    QWindow sub_window(&tlw_dialog);
+    sub_window.resize(200,300);
+    sub_window.show();
+
+    tlw_dialog.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&tlw_dialog));
+    QVERIFY(QTest::qWaitForWindowExposed(&sub_window));
+
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &tlw_dialog);
+
+    sub_window.requestActivate();
+    QGuiApplication::sync();
+    QGuiApplication::processEvents();
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &sub_window);
+}
+
+void tst_QWindow::modalWindowModallity()
+{
+    QWindow normal_window;
+    normal_window.resize(400, 400);
+    normal_window.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&normal_window));
+
+    QWindow parent_to_modal;
+    parent_to_modal.resize(400, 400);
+    parent_to_modal.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&parent_to_modal));
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &parent_to_modal);
+
+    QWindow modal_dialog;
+    modal_dialog.resize(400,200);
+    modal_dialog.setModality(Qt::WindowModal);
+    modal_dialog.setFlags(Qt::Dialog);
+    modal_dialog.setTransientParent(&parent_to_modal);
+    modal_dialog.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&modal_dialog));
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &modal_dialog);
+
+    normal_window.requestActivate();
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &normal_window);
+
+}
+
 #include <tst_qwindow.moc>
 QTEST_MAIN(tst_QWindow)