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

Change-Id: I94cb5a7dab97cff3591bac534228bfd3e3ad5938

3 files changed, 85 insertions, 1 deletions

diff --git a/sources/pyside2/tests/QtQml/bug_847.py b/sources/pyside2/tests/QtQml/bug_847.py
index e46888d17..e69bd201a 100755
--- a/sources/pyside2/tests/QtQml/bug_847.py
+++ b/sources/pyside2/tests/QtQml/bug_847.py
@@ -66,11 +66,18 @@ class TestQML(UsesQApplication):
         # Connect first, then set the property.
         view.called.connect(self.done)
         view.setSource(QUrl.fromLocalFile(adjust_filename('bug_847.qml', __file__)))
+        while view.status() == QQuickView.Loading:
+            self.app.processEvents()
+        self.assertEqual(view.status(), QQuickView.Ready)
+        self.assertTrue(view.rootObject())
         view.rootObject().setProperty('pythonObject', view)
 
         view.show()
+        while not view.isExposed():
+            self.app.processEvents()
+
         # Essentially a timeout in case method invocation fails.
-        QTimer.singleShot(2000, QCoreApplication.instance().quit)
+        QTimer.singleShot(30000, QCoreApplication.instance().quit)
         self.app.exec_()
         self.assertTrue(self._sucess)
 
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt
index 5941df5e5..16380e490 100644
--- a/sources/pyside2/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt
@@ -143,3 +143,4 @@ PYSIDE_TEST(mixin_signal_slots_test.py)
 PYSIDE_TEST(signal_slot_warning.py)
 PYSIDE_TEST(all_modules_load_test.py)
 PYSIDE_TEST(signature_test.py)
+PYSIDE_TEST(qapp_like_a_macro_test.py)
diff --git a/sources/pyside2/tests/pysidetest/qapp_like_a_macro_test.py b/sources/pyside2/tests/pysidetest/qapp_like_a_macro_test.py
new file mode 100644
index 000000000..6205748ec
--- /dev/null
+++ b/sources/pyside2/tests/pysidetest/qapp_like_a_macro_test.py
@@ -0,0 +1,76 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of PySide2.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+import unittest
+import PySide2
+
+# This test tests the new "macro" feature of qApp.
+# It also uses the qApp variable to finish the instance and start over.
+
+class qAppMacroTest(unittest.TestCase):
+    def test_qApp_is_like_a_macro_and_can_restart(self):
+        from PySide2 import QtCore
+        try:
+            from PySide2 import QtGui, QtWidgets
+        except ImportError:
+            QtWidgets = QtGui = QtCore
+        # qApp is in the builtins
+        qApp
+        # and also in certain PySide modules
+        QtCore.qApp, QtGui.qApp, QtWidgets.qApp
+        # and they are all the same
+        self.assertTrue(qApp is QtCore.qApp is QtGui.qApp is QtWidgets.qApp)
+        # and the type is NoneType, but it is not None (cannot work)
+        self.assertTrue(type(qApp) is type(None))
+        self.assertTrue(qApp is not None)
+        # now we create an application for all cases
+        classes = (QtCore.QCoreApplication,
+                   QtGui.QGuiApplication,
+                   QtWidgets.QApplication)
+        for klass in classes:
+            print("created", klass([]))
+            del __builtins__.qApp
+            print("deleted qApp")
+        # creating without deletion raises:
+        QtCore.QCoreApplication([])
+        with self.assertRaises(RuntimeError):
+            QtCore.QCoreApplication([])
+        # assigning qApp is obeyed
+        QtCore.qApp = 42
+        del __builtins__.qApp
+        self.assertEqual(QtCore.qApp, 42)
+        self.assertNotEqual(__builtins__, 42)
+        # delete it and it re-appears
+        del QtCore.qApp
+        QtCore.QCoreApplication([])
+        self.assertEqual(QtCore.QCoreApplication.instance(), QtCore.qApp)
+        # and they are again all the same
+        self.assertTrue(qApp is QtCore.qApp is QtGui.qApp is QtWidgets.qApp)
+
+if __name__ == '__main__':
+    unittest.main()