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

Change-Id: I94cb5a7dab97cff3591bac534228bfd3e3ad5938

14 files changed, 135 insertions, 214 deletions

diff --git a/sources/pyside2/PySide2/QtCore/glue/qcoreapplication_init.cpp b/sources/pyside2/PySide2/QtCore/glue/qcoreapplication_init.cpp
index c48b4ffa0..b2dfae38f 100644
--- a/sources/pyside2/PySide2/QtCore/glue/qcoreapplication_init.cpp
+++ b/sources/pyside2/PySide2/QtCore/glue/qcoreapplication_init.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of PySide2.
@@ -37,27 +37,14 @@
 **
 ****************************************************************************/
 
-// Global variables used to store argc and argv values
-static int QCoreApplicationArgCount;
-static char** QCoreApplicationArgValues;
-
-void QCoreApplication_constructor(PyObject* self, PyObject* args, QCoreApplicationWrapper** cptr)
+static void QCoreApplicationConstructor(PyObject *self, PyObject *pyargv, QCoreApplicationWrapper **cptr)
 {
-    if (QCoreApplication::instance()) {
-        PyErr_SetString(PyExc_RuntimeError, "A QCoreApplication instance already exists.");
-        return;
-    }
-
-    int numArgs = PyTuple_GET_SIZE(args);
-    if (numArgs != 1
-        || !Shiboken::sequenceToArgcArgv(PyTuple_GET_ITEM(args, 0), &QCoreApplicationArgCount, &QCoreApplicationArgValues, "PySideApp")) {
-        PyErr_BadArgument();
-        return;
+    static int argc;
+    static char **argv;
+    PyObject *stringlist = PyTuple_GET_ITEM(pyargv, 0);
+    if (Shiboken::listToArgcArgv(stringlist, &argc, &argv, "PySideApp")) {
+        *cptr = new QCoreApplicationWrapper(argc, argv);
+        Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
+        PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
     }
-
-    *cptr = new QCoreApplicationWrapper(QCoreApplicationArgCount, QCoreApplicationArgValues, QT_VERSION);
-
-    Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
-    PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
-    Py_INCREF(self);
 }
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index bb0986f10..2b441eba0 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -3262,9 +3262,9 @@
     in a more convenient form by the :meth:`~QCoreApplication.arguments()`
     method.
     </inject-documentation>
-    <add-function signature="QCoreApplication(PySequence)">
+    <add-function signature="QCoreApplication(QStringList)">
         <inject-code>
-            QCoreApplication_constructor(%PYSELF, args, &amp;%0);
+            QCoreApplicationConstructor(%PYSELF, args, &amp;%0);
         </inject-code>
     </add-function>
     <!-- blocking functions -->
@@ -3275,23 +3275,24 @@
     <modify-function signature="sendPostedEvents(QObject*, int)" allow-thread="yes"/>
     <modify-function signature="instance()">
       <inject-code class="target">
-        QCoreApplication* app = QCoreApplication::instance();
-        PyObject* pyApp = Py_None;
+        QCoreApplication *app = QCoreApplication::instance();
+        PyObject *pyApp = Py_None;
         if (app) {
-            pyApp = reinterpret_cast&lt;PyObject*&gt;(Shiboken::BindingManager::instance().retrieveWrapper(app));
+            pyApp = reinterpret_cast&lt;PyObject*&gt;(
+                Shiboken::BindingManager::instance().retrieveWrapper(app));
             if (!pyApp)
-                pyApp = %CONVERTTOPYTHON[QCoreApplication*](app); // this will keep app live after python exit (extra ref)
+                pyApp = %CONVERTTOPYTHON[QCoreApplication*](app);
+                // this will keep app live after python exit (extra ref)
         }
+        // PYSIDE-571: make sure that we return the singleton "None"
+        if (pyApp == Py_None)
+            Py_DECREF(MakeSingletonQAppWrapper(0)); // here qApp and instance() diverge
         %PYARG_0 = pyApp;
         Py_XINCREF(%PYARG_0);
       </inject-code>
     </modify-function>
 
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
-    <!-- ### Obsolete
-    <modify-function signature="argc()" remove="all"/>
-    <modify-function signature="argv()" remove="all"/>
-    -->
     <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes">
       <modify-argument index="2" invalidate-after-use="yes"/>
     </modify-function>
diff --git a/sources/pyside2/PySide2/QtGui/glue/qguiapplication_init.cpp b/sources/pyside2/PySide2/QtGui/glue/qguiapplication_init.cpp
index 60507f37a..38a4c1ccb 100644
--- a/sources/pyside2/PySide2/QtGui/glue/qguiapplication_init.cpp
+++ b/sources/pyside2/PySide2/QtGui/glue/qguiapplication_init.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of PySide2.
@@ -37,34 +37,14 @@
 **
 ****************************************************************************/
 
-// Borrowed reference to QtGui module
-extern PyObject* moduleQtGui;
-
-static int QGuiApplicationArgCount;
-static char** QGuiApplicationArgValues;
-
-bool QGuiApplicationConstructorStart(PyObject* argv)
-{
-    if (QGuiApplication::instance()) {
-        PyErr_SetString(PyExc_RuntimeError, "A QGuiApplication instance already exists.");
-        return false;
-    }
-
-    return Shiboken::sequenceToArgcArgv(argv, &QGuiApplicationArgCount, &QGuiApplicationArgValues, "PySideApp");
-}
-
-void QGuiApplicationConstructorEnd(PyObject* self)
-{
-    PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
-    Py_INCREF(self);
-}
-
-static void QGuiApplicationConstructor(PyObject* self, PyObject* argv, QGuiApplicationWrapper** cptr)
+static void QGuiApplicationConstructor(PyObject *self, PyObject *pyargv, QGuiApplicationWrapper **cptr)
 {
-    if (QGuiApplicationConstructorStart(argv)) {
-        // XXX do we need to support the ApplicationFlags parameter, instead of 0?
-        *cptr = new QGuiApplicationWrapper(QGuiApplicationArgCount, QGuiApplicationArgValues, 0);
+    static int argc;
+    static char **argv;
+    PyObject *stringlist = PyTuple_GET_ITEM(pyargv, 0);
+    if (Shiboken::listToArgcArgv(stringlist, &argc, &argv, "PySideApp")) {
+        *cptr = new QGuiApplicationWrapper(argc, argv, 0);
         Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
-        QGuiApplicationConstructorEnd(self);
+        PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
     }
 }
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index dd8404ce0..9260b3d38 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -3238,10 +3238,7 @@
   <!-- Qt5: not sure if this needs support, skipped for now -->
   <rejection class="QWindow" function-name="nativeEvent"/>"
 
-  <!-- Qt5: here the new QGuiApplication and related things -->
   <object-type name="QGuiApplication">
-    <!-- Qt5: gone <enum-type name="ColorSpec"/> -->
-    <!-- Qt5: gone <enum-type name="Type"/> -->
     <extra-includes>
       <include file-name="QBasicTimer" location="global"/>
       <include file-name="QFont" location="global"/>
@@ -3251,9 +3248,9 @@
       <include file-name="QLocale" location="global"/>
     </extra-includes>
     <modify-function signature="QGuiApplication(int&amp;,char**,int)" access="private" />
-    <add-function signature="QGuiApplication(PySequence)">
+    <add-function signature="QGuiApplication(QStringList)">
         <inject-code>
-            QGuiApplicationConstructor(%PYSELF, %1, &amp;%0);
+            QGuiApplicationConstructor(%PYSELF, args, &amp;%0);
         </inject-code>
     </add-function>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
diff --git a/sources/pyside2/PySide2/QtWidgets/glue/qapplication_init.cpp b/sources/pyside2/PySide2/QtWidgets/glue/qapplication_init.cpp
index 0de34d9c5..1419f5755 100644
--- a/sources/pyside2/PySide2/QtWidgets/glue/qapplication_init.cpp
+++ b/sources/pyside2/PySide2/QtWidgets/glue/qapplication_init.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of PySide2.
@@ -37,44 +37,14 @@
 **
 ****************************************************************************/
 
-// Borrowed reference to QtWidgets module
-extern PyObject* moduleQtWidgets;
-
-static int QApplicationArgCount;
-static char** QApplicationArgValues;
-static const char QAPP_MACRO[] = "qApp";
-
-bool QApplicationConstructorStart(PyObject* argv)
-{
-    if (QApplication::instance()) {
-        PyErr_SetString(PyExc_RuntimeError, "A QApplication instance already exists.");
-        return false;
-    }
-
-    return Shiboken::sequenceToArgcArgv(argv, &QApplicationArgCount, &QApplicationArgValues, "PySideApp");
-}
-
-void QApplicationConstructorEnd(PyObject* self)
-{
-    // Verify if qApp is in main module
-    PyObject* globalsDict = PyEval_GetGlobals();
-    if (globalsDict) {
-        PyObject* qAppObj = PyDict_GetItemString(globalsDict, QAPP_MACRO);
-        if (qAppObj)
-            PyDict_SetItemString(globalsDict, QAPP_MACRO, self);
-    }
-
-    PyObject_SetAttrString(moduleQtWidgets, QAPP_MACRO, self);
-    PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
-    Py_INCREF(self);
-}
-
-static void QApplicationConstructor(PyObject* self, PyObject* argv, QApplicationWrapper** cptr)
+static void QApplicationConstructor(PyObject *self, PyObject *pyargv, QApplicationWrapper **cptr)
 {
-    if (QApplicationConstructorStart(argv)) {
-         // XXX do we need to support the ApplicationFlags parameter, instead of 0?
-        *cptr = new QApplicationWrapper(QApplicationArgCount, QApplicationArgValues, 0);
+    static int argc;
+    static char **argv;
+    PyObject *stringlist = PyTuple_GET_ITEM(pyargv, 0);
+    if (Shiboken::listToArgcArgv(stringlist, &argc, &argv, "PySideApp")) {
+        *cptr = new QApplicationWrapper(argc, argv, 0);
         Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject*>(self));
-        QApplicationConstructorEnd(self);
+        PySide::registerCleanupFunction(&PySide::destroyQCoreApplication);
     }
 }
diff --git a/sources/pyside2/PySide2/QtWidgets/glue/qtwidgets_qapp.cpp b/sources/pyside2/PySide2/QtWidgets/glue/qtwidgets_qapp.cpp
deleted file mode 100644
index e041c7680..000000000
--- a/sources/pyside2/PySide2/QtWidgets/glue/qtwidgets_qapp.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of PySide2.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Init qApp macro to None.
-if (qApp) {
-    PyObject* pyApp = %CONVERTTOPYTHON[QApplication*](qApp);
-    Py_INCREF(pyApp);
-    PyModule_AddObject(module, "qApp", pyApp);
-} else {
-    Py_INCREF(Py_None);
-    PyModule_AddObject(module, "qApp", Py_None);
-}
-moduleQtWidgets = module;
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 7c16781c8..624ef591a 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -3127,11 +3127,6 @@
     </modify-function>
   </object-type>
 
-  <!-- qApp macro -->
-  <inject-code class="native" position="beginning">
-    PyObject* moduleQtWidgets;
-  </inject-code>
-  <inject-code class="target" file="glue/qtwidgets_qapp.cpp" position="end" />
   <object-type name="QApplication">
     <enum-type name="ColorSpec"/>
     <extra-includes>
@@ -3144,55 +3139,13 @@
       <include file-name="QStyle" location="global"/>
     </extra-includes>
     <modify-function signature="QApplication(int&amp;,char**,int)" access="private" />
-    <add-function signature="QApplication(PySequence)">
+    <add-function signature="QApplication(QStringList)">
         <inject-code>
-            QApplicationConstructor(%PYSELF, %1, &amp;%0);
+            QApplicationConstructor(%PYSELF, args, &amp;%0);
         </inject-code>
     </add-function>
     <modify-function signature="exec()" rename="exec_" allow-thread="yes"/>
     <inject-code class="native" file="glue/qapplication_init.cpp" position="beginning" />
-
-    <!-- ownership control transfer to qApp -->
-    <modify-function signature="setStyle(QStyle*)">
-        <inject-code class="target" position="end">
-            Shiboken::Object::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_1);
-        </inject-code>
-    </modify-function>
-    <modify-function signature="style()">
-      <inject-code class="target" position="end">
-        <insert-template name="set_qapp_parent_for_orphan"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="desktop()">
-      <inject-code class="target" position="end">
-        <insert-template name="set_qapp_parent_for_orphan"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="focusWidget()">
-      <inject-code class="target" position="end">
-        <insert-template name="set_qapp_parent_for_orphan"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="topLevelAt(const QPoint&amp;)">
-      <inject-code class="target" position="end">
-        <insert-template name="set_qapp_parent_for_orphan"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="topLevelAt(int, int)">
-      <inject-code class="target" position="end">
-        <insert-template name="set_qapp_parent_for_orphan"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="widgetAt(const QPoint&amp;)">
-      <inject-code class="target" position="end">
-        <insert-template name="set_qapp_parent_for_orphan"/>
-      </inject-code>
-    </modify-function>
-    <modify-function signature="widgetAt(int, int)">
-      <inject-code class="target" position="end">
-        <insert-template name="set_qapp_parent_for_orphan"/>
-      </inject-code>
-    </modify-function>
   </object-type>
 
   <object-type name="QCommandLinkButton"/>
diff --git a/sources/pyside2/PySide2/support/signature/inspect.py b/sources/pyside2/PySide2/support/signature/inspect.py
index b59368229..cae96bc16 100644
--- a/sources/pyside2/PySide2/support/signature/inspect.py
+++ b/sources/pyside2/PySide2/support/signature/inspect.py
@@ -1238,9 +1238,10 @@ def getargvalues(frame):
     args, varargs, varkw = getargs(frame.f_code)
     return ArgInfo(args, varargs, varkw, frame.f_locals)
 
+# This function is changed because we use a local copy of typing
 def formatannotation(annotation, base_module=None):
-    if getattr(annotation, '__module__', None) == 'typing':
-        return repr(annotation).replace('typing.', '')
+    if getattr(annotation, '__module__', None) == 'PySide2.support.signature.typing':
+        return repr(annotation).replace('PySide2.support.signature.typing.', '')
     if isinstance(annotation, type):
         if annotation.__module__ in ('builtins', base_module):
             return annotation.__qualname__
diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py
index c9a028dd2..a03abc08d 100644
--- a/sources/pyside2/PySide2/support/signature/mapping.py
+++ b/sources/pyside2/PySide2/support/signature/mapping.py
@@ -109,13 +109,13 @@ class Reloader(object):
         if self.sys_module_count == len(sys.modules):
             return
         self.sys_module_count = len(sys.modules)
+        g = globals()
         for mod_name in self.uninitialized[:]:
             if "PySide2." + mod_name in sys.modules:
                 self.uninitialized.remove(mod_name)
                 proc_name = "init_" + mod_name
-                if proc_name in globals():
-                    init_proc = globals()[proc_name]
-                    globals().update(init_proc())
+                if proc_name in g:
+                    g.update(g[proc_name]())
 
 update_mapping = Reloader().update
 type_map = {}
diff --git a/sources/pyside2/PySide2/typesystem_templates.xml b/sources/pyside2/PySide2/typesystem_templates.xml
index d9258ba88..7ac4ac158 100644
--- a/sources/pyside2/PySide2/typesystem_templates.xml
+++ b/sources/pyside2/PySide2/typesystem_templates.xml
@@ -297,13 +297,7 @@
     PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
     PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG5_TYPE](%5));
     </template>
-    <template name="set_qapp_parent_for_orphan">
-        if (%PYARG_0 &amp;&amp; (%PYARG_0 != Py_None)) {
-            SbkObject* _pySelf = reinterpret_cast&lt;SbkObject*&gt;(%PYARG_0);
-            if (!Shiboken::Object::hasParentInfo(_pySelf))
-                Shiboken::Object::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_0);
-        }
-    </template>
+
     <!-- templates for __repr__ -->
     <template name="repr_code">
         QString format = QString().sprintf("%s(%REPR_FORMAT)", ((PyObject*)%PYSELF)->ob_type->tp_name, %REPR_ARGS);
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index 7d05f45a5..d4e867c61 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -50,6 +50,7 @@
 #include "dynamicqmetaobject.h"
 #include "destroylistener.h"
 
+#include <qapp_macro.h>
 #include <basewrapper.h>
 #include <conversions.h>
 #include <sbkconverter.h>
@@ -174,6 +175,8 @@ void destroyQCoreApplication()
     Py_BEGIN_ALLOW_THREADS
     delete app;
     Py_END_ALLOW_THREADS
+    // PYSIDE-571: make sure to create a singleton deleted qApp.
+    MakeSingletonQAppWrapper(NULL);
 }
 
 struct TypeUserData {
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()