Add QQuickWindow::closing signal, and ability to ignore the event

An application can implement onClosing() and set
closeEvent.accepted = false to delay the closing (for example to
prompt the user to save changes).  Depends on change
I9abed47fca02a002b78727f98d678a824854adfc in qtbase.

Task-number: QTBUG-31019
Change-Id: Icfd4a03ecef3621bdbbee2e2c3157b897a9b6524
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>

2 files changed, 53 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickwindow/data/ucantclosethis.qml b/tests/auto/quick/qquickwindow/data/ucantclosethis.qml
new file mode 100644
index 0000000000..aa68cf5105
--- /dev/null
+++ b/tests/auto/quick/qquickwindow/data/ucantclosethis.qml
@@ -0,0 +1,32 @@
+import QtQuick 2.1
+import QtQuick.Window 2.1
+
+Window {
+    width: 240
+    height: 75
+    title: "Hammer sez"
+    color: "#e0c31e"
+    property bool canCloseThis: false;
+    Rectangle {
+        color: "#14148c"
+        width: parent.width * 0.85
+        height: parent.height * 0.7
+        anchors.horizontalCenter: parent.horizontalCenter
+        Text {
+            id: text
+            anchors.centerIn: parent
+            color: "white"
+            textFormat: Text.StyledText
+            text: "whoa-oa-oa-oh<br/>U can't <font color='#b40000' size='+1'>close</font> this"
+        }
+    }
+    onClosing: {
+        if (canCloseThis) {
+            text.text = "uncle! I give up"
+            // the event is accepted by default
+        } else {
+            close.accepted = false
+            text.text = "...but you still can't close this"
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index c3308bfd7d..e2bb6b431c 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -326,6 +326,8 @@ private slots:
 
     void requestActivate();
 
+    void blockClosing();
+
 #ifndef QT_NO_CURSOR
     void cursor();
 #endif
@@ -1466,6 +1468,25 @@ void tst_qquickwindow::requestActivate()
     QVERIFY(windows.at(0)->isActive());
 }
 
+void tst_qquickwindow::blockClosing()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.loadUrl(testFileUrl("ucantclosethis.qml"));
+    QQuickWindow* window = qobject_cast<QQuickWindow *>(component.create());
+    QVERIFY(window);
+    window->show();
+    QTest::qWaitForWindowExposed(window);
+    QVERIFY(window->isVisible());
+    QWindowSystemInterface::handleCloseEvent(window);
+    QVERIFY(window->isVisible());
+    QWindowSystemInterface::handleCloseEvent(window);
+    QVERIFY(window->isVisible());
+    window->setProperty("canCloseThis", true);
+    QWindowSystemInterface::handleCloseEvent(window);
+    QTRY_VERIFY(!window->isVisible());
+}
+
 QTEST_MAIN(tst_qquickwindow)
 
 #include "tst_qquickwindow.moc"