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

Change-Id: I94cb5a7dab97cff3591bac534228bfd3e3ad5938

3 files changed, 10 insertions, 136 deletions

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"/>