Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I9a10e1f3c9506ec8554d8f59b6300825ac730939

2 files changed, 55 insertions, 28 deletions

diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index c47e88b0e6..1f0ace0dd3 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -40,8 +40,6 @@
 #include <QtNetwork/QHostInfo>
 #include <stdlib.h>
 
-# include <private/qprocess_p.h>    // only so we get QPROCESS_USE_SPAWN
-
 typedef void (QProcess::*QProcessFinishedSignal1)(int);
 typedef void (QProcess::*QProcessFinishedSignal2)(int, QProcess::ExitStatus);
 typedef void (QProcess::*QProcessErrorSignal)(QProcess::ProcessError);
@@ -321,9 +319,6 @@ void tst_QProcess::startDetached()
 {
     QVERIFY(QProcess::startDetached("testProcessNormal/testProcessNormal",
                                     QStringList() << "arg1" << "arg2"));
-#ifdef QPROCESS_USE_SPAWN
-    QEXPECT_FAIL("", "QProcess cannot detect failure to start when using posix_spawn()", Continue);
-#endif
     QCOMPARE(QProcess::startDetached("nonexistingexe"), false);
 }
 
@@ -706,9 +701,6 @@ void tst_QProcess::waitForFinished()
     QCOMPARE(output.count("\n"), 10*1024);
 
     process.start("blurdybloop");
-#if defined(QPROCESS_USE_SPAWN) && !defined(Q_OS_QNX)
-    QEXPECT_FAIL("", "QProcess cannot detect failure to start when using posix_spawn()", Abort);
-#endif
     QVERIFY(!process.waitForFinished());
     QCOMPARE(process.error(), QProcess::FailedToStart);
 }
@@ -921,6 +913,16 @@ void tst_QProcess::hardExit()
 #endif
 
     QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString()));
+
+#if defined(Q_OS_QNX)
+    // QNX may lose the kill if it's delivered while the forked process
+    // is doing the exec that morphs it into testProcessEcho.  It's very
+    // unlikely that a normal application would do such a thing.  Make
+    // sure the test doesn't accidentally try to do it.
+    proc.write("A");
+    QVERIFY(proc.waitForReadyRead(5000));
+#endif
+
     proc.kill();
 
     QVERIFY(proc.waitForFinished(5000));
@@ -1524,11 +1526,6 @@ void tst_QProcess::createProcessArgumentsModifier()
 void tst_QProcess::exitCodeTest()
 {
     for (int i = 0; i < 255; ++i) {
-#ifdef QPROCESS_USE_SPAWN
-        // POSIX reserves exit code 127 when using posix_spawn
-        if (i == 127)
-            continue;
-#endif
         QProcess process;
         process.start("testExitCodes/testExitCodes " + QString::number(i));
         QVERIFY(process.waitForFinished(5000));
@@ -1539,9 +1536,6 @@ void tst_QProcess::exitCodeTest()
 
 void tst_QProcess::failToStart()
 {
-#if defined(QPROCESS_USE_SPAWN) && !defined(Q_OS_QNX)
-    QSKIP("QProcess cannot detect failure to start when using posix_spawn()");
-#endif
     qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
     qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
     qRegisterMetaType<QProcess::ProcessState>("QProcess::ProcessState");
@@ -1612,9 +1606,6 @@ void tst_QProcess::failToStart()
 
 void tst_QProcess::failToStartWithWait()
 {
-#if defined(QPROCESS_USE_SPAWN) && !defined(Q_OS_QNX)
-    QSKIP("QProcess cannot detect failure to start when using posix_spawn()");
-#endif
     qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
     qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
 
@@ -1644,9 +1635,6 @@ void tst_QProcess::failToStartWithWait()
 
 void tst_QProcess::failToStartWithEventLoop()
 {
-#if defined(QPROCESS_USE_SPAWN) && !defined(Q_OS_QNX)
-    QSKIP("QProcess cannot detect failure to start when using posix_spawn()");
-#endif
     qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
     qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
 
@@ -1933,9 +1921,6 @@ void tst_QProcess::waitForReadyReadForNonexistantProcess()
     QVERIFY(!process.waitForReadyRead()); // used to crash
     process.start("doesntexist");
     QVERIFY(!process.waitForReadyRead());
-#if defined(QPROCESS_USE_SPAWN) && !defined(Q_OS_QNX)
-    QEXPECT_FAIL("", "QProcess cannot detect failure to start when using posix_spawn()", Abort);
-#endif
     QCOMPARE(errorSpy.count(), 1);
     QCOMPARE(errorSpy.at(0).at(0).toInt(), 0);
     QCOMPARE(errorSpy2.count(), 1);
@@ -2303,9 +2288,6 @@ void tst_QProcess::setNonExistentWorkingDirectory()
     // while on Unix with fork it's relative to the child's (with posix_spawn, it could be either).
     process.start(QFileInfo("testSetWorkingDirectory/testSetWorkingDirectory").absoluteFilePath());
     QVERIFY(!process.waitForFinished());
-#ifdef QPROCESS_USE_SPAWN
-    QEXPECT_FAIL("", "QProcess cannot detect failure to start when using posix_spawn()", Continue);
-#endif
     QCOMPARE(int(process.error()), int(QProcess::FailedToStart));
 
 #ifdef Q_OS_UNIX
diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index cd8bce173b..200c8a6ced 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -41,6 +41,8 @@
 #include <qboxlayout.h>
 #include <qtabwidget.h>
 #include <qlabel.h>
+#include <qmainwindow.h>
+#include <qtoolbar.h>
 #include <private/qwindow_p.h>
 
 static inline void setFrameless(QWidget *w)
@@ -94,6 +96,8 @@ private slots:
     void tst_move_count();
 
     void tst_eventfilter_on_toplevel();
+
+    void QTBUG_50561_QCocoaBackingStore_paintDevice_crash();
 };
 
 void tst_QWidget_window::initTestCase()
@@ -790,5 +794,46 @@ void tst_QWidget_window::tst_eventfilter_on_toplevel()
     QTRY_COMPARE(filter.eventCount, 1);
 }
 
+class ApplicationStateSaver
+{
+public:
+    ApplicationStateSaver()
+    {
+        QApplication::setAttribute(Qt::AA_NativeWindows, true);
+        QApplication::setQuitOnLastWindowClosed(false);
+    }
+
+    ~ApplicationStateSaver()
+    {
+        QApplication::setAttribute(Qt::AA_NativeWindows, false);
+        QApplication::setQuitOnLastWindowClosed(true);
+    }
+};
+
+void tst_QWidget_window::QTBUG_50561_QCocoaBackingStore_paintDevice_crash()
+{
+    // Keep application state clean if testcase fails
+    ApplicationStateSaver as;
+
+    QMainWindow w;
+    w.addToolBar(new QToolBar(&w));
+    w.show();
+    QTest::qWaitForWindowExposed(&w);
+
+    // Simulate window system close
+    QCloseEvent *e = new QCloseEvent;
+    e->accept();
+    qApp->postEvent(w.windowHandle(), e);
+    qApp->processEvents();
+
+    // Show again
+    w.show();
+    qApp->processEvents();
+
+    // No crash, all good.
+    // Wrap up and leave
+    w.close();
+}
+
 QTEST_MAIN(tst_QWidget_window)
 #include "tst_qwidget_window.moc"