Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"

40 files changed, 142 insertions, 5 deletions

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 9f8d07733..9ffc7d376 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -2514,11 +2514,12 @@
         <define-ownership class="target" owner="default"/>
       </modify-argument>
     </modify-function>
-    <modify-function signature="value(const QString&amp;,const QVariant&amp;)const">
-        <inject-documentation mode="append" format="target">
-            .. warning:: QSettings.value can return different types (QVariant types) depending on the platform it's running on, so the safest way to use it is always casting the result to the desired type, e.g.: int(settings.value("myKey"))
-        </inject-documentation>
-    </modify-function>
+    <!-- PYSIDE-1010:
+    We remove the original implementation of value() to include the optional parameter -->
+    <modify-function signature="value(const QString&amp;,const QVariant&amp;)const" remove="all"/>
+    <add-function signature="value(const QString&amp;, const QVariant&amp; @defaultValue@ = 0, PyObject* @type@ = 0)" return-type="PyObject*">
+      <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qsettings-value"/>
+    </add-function>
   </object-type>
   <object-type name="QEvent"  polymorphic-id-expression="%1-&gt;type() == QEvent::None">
     <enum-type name="Type"/>
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp
index 930ad9349..3e1bab97b 100644
--- a/sources/pyside2/PySide2/glue/qtcore.cpp
+++ b/sources/pyside2/PySide2/glue/qtcore.cpp
@@ -56,6 +56,56 @@ bool py2kStrCheck(PyObject *obj)
 }
 // @snippet pystring-check
 
+// @snippet qsettings-value
+QVariant out = %CPPSELF.value(%1, %2);
+PyTypeObject *typeObj = reinterpret_cast<PyTypeObject*>(%PYARG_3);
+
+if (typeObj) {
+    if (typeObj == &PyList_Type) {
+        QByteArrayList valuesList = out.toByteArray().split(',');
+        const int valuesSize = valuesList.size();
+        if (valuesSize > 0) {
+            PyObject *list = PyList_New(valuesSize);
+            for (int i = 0; i < valuesSize; i++) {
+                PyObject *item = PyUnicode_FromString(valuesList[i].data());
+                PyList_SET_ITEM(list, i, item);
+                Py_DECREF(item);
+            }
+            %PYARG_0 = list;
+
+        } else {
+            %PYARG_0 = %CONVERTTOPYTHON[QVariant](out);
+        }
+    } else if (typeObj == &PyBytes_Type) {
+        QByteArray asByteArray = out.toByteArray();
+        %PYARG_0 = PyBytes_FromString(asByteArray.data());
+    } else if (typeObj == &PyUnicode_Type) {
+        QByteArray asByteArray = out.toByteArray();
+        %PYARG_0 = PyUnicode_FromString(asByteArray.data());
+#ifdef IS_PY3K
+    } else if (typeObj == &PyLong_Type) {
+        float asFloat = out.toFloat();
+        pyResult = PyLong_FromDouble(asFloat);
+#else
+    } else if (typeObj == &PyInt_Type) {
+        float asFloat = out.toFloat();
+        pyResult = PyInt_FromLong(long(asFloat));
+#endif
+    } else if (typeObj == &PyFloat_Type) {
+        float asFloat = out.toFloat();
+        %PYARG_0 = PyFloat_FromDouble(asFloat);
+    }
+    // TODO: PyDict_Type and PyTuple_Type
+}
+else {
+    if (out == 0)
+        %PYARG_0 = Py_None;
+    else
+        %PYARG_0 = %CONVERTTOPYTHON[QVariant](out);
+}
+
+// @snippet qsettings-value
+
 // @snippet qvariant-conversion
 static const char *QVariant_resolveMetaType(PyTypeObject *type, int *typeId)
 {
diff --git a/sources/pyside2/PySide2/support/generate_pyi.py b/sources/pyside2/PySide2/support/generate_pyi.py
index 294cdc91b..c732227f4 100644
--- a/sources/pyside2/PySide2/support/generate_pyi.py
+++ b/sources/pyside2/PySide2/support/generate_pyi.py
@@ -252,6 +252,10 @@ def generate_all_pyi(outpath, options):
     from PySide2.support.signature import inspect
     from PySide2.support.signature.lib.enum_sig import HintingEnumerator
 
+    # propagate USE_PEP563 to the mapping module.
+    # Perhaps this can be automated?
+    PySide2.support.signature.mapping.USE_PEP563 = USE_PEP563
+
     outpath = outpath or os.path.dirname(PySide2.__file__)
     name_list = PySide2.__all__ if options.modules == ["all"] else options.modules
     errors = ", ".join(set(name_list) - set(PySide2.__all__))
diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt
index 08e63d043..d05699f16 100644
--- a/sources/pyside2/tests/QtCore/CMakeLists.txt
+++ b/sources/pyside2/tests/QtCore/CMakeLists.txt
@@ -96,6 +96,7 @@ PYSIDE_TEST(qrect_test.py)
 PYSIDE_TEST(qregexp_test.py)
 PYSIDE_TEST(qregularexpression_test.py)
 PYSIDE_TEST(qresource_test.py)
+PYSIDE_TEST(qsettings_test.py)
 PYSIDE_TEST(qsize_test.py)
 PYSIDE_TEST(qslot_object_test.py)
 PYSIDE_TEST(qsocketnotifier_test.py)
diff --git a/sources/pyside2/tests/QtCore/qsettings_test.ini b/sources/pyside2/tests/QtCore/qsettings_test.ini
new file mode 100644
index 000000000..f54ae0029
--- /dev/null
+++ b/sources/pyside2/tests/QtCore/qsettings_test.ini
@@ -0,0 +1,4 @@
+[General]
+var1=a, b, c
+var2=a
+
diff --git a/sources/pyside2/tests/QtCore/qsettings_test.py b/sources/pyside2/tests/QtCore/qsettings_test.py
new file mode 100644
index 000000000..6d64b0db3
--- /dev/null
+++ b/sources/pyside2/tests/QtCore/qsettings_test.py
@@ -0,0 +1,77 @@
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $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$
+##
+#############################################################################
+
+'''Test cases for QDate'''
+
+import unittest
+
+import os
+from helper import adjust_filename
+import py3kcompat as py3k
+from PySide2.QtCore import QSettings
+
+class TestQSettings(unittest.TestCase):
+    def testConversions(self):
+        file_path = adjust_filename('qsettings_test.ini', __file__)
+        settings = QSettings(file_path, QSettings.IniFormat)
+
+        r = settings.value('var1')
+        self.assertEqual(type(r), list)
+
+        r = settings.value('var2')
+        if py3k.IS_PY3K:
+            self.assertEqual(type(r), str)
+        else:
+            self.assertEqual(type(r), unicode)
+
+        r = settings.value('var2', type=list)
+        self.assertEqual(type(r), list)
+
+
+    def testDefaultValueConversion(self):
+        settings = QSettings('foo.ini', QSettings.IniFormat)
+        r = settings.value('lala', 22)
+        if py3k.IS_PY3K:
+            self.assertEqual(type(r), int)
+        else:
+            self.assertEqual(type(r), long)
+
+        r = settings.value('lala', 22, type=str)
+        self.assertEqual(type(r), str)
+
+        r = settings.value('lala', 22, type=bytes)
+        self.assertEqual(type(r), bytes)
+
+        r = settings.value('lala', 22, type=int)
+        self.assertEqual(type(r), int)
+
+        r = settings.value('lala', 22, type=float)
+        self.assertEqual(type(r), float)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/sources/pyside2/tests/QtQml/CMakeLists.txt b/sources/pyside2/tests/QtQml/CMakeLists.txt
index e2beb951e..e2beb951e 100755..100644
--- a/sources/pyside2/tests/QtQml/CMakeLists.txt
+++ b/sources/pyside2/tests/QtQml/CMakeLists.txt
diff --git a/sources/pyside2/tests/QtQml/bug_1029.py b/sources/pyside2/tests/QtQml/bug_1029.py
index 92734cb3b..92734cb3b 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_1029.py
+++ b/sources/pyside2/tests/QtQml/bug_1029.py
diff --git a/sources/pyside2/tests/QtQml/bug_1029.qml b/sources/pyside2/tests/QtQml/bug_1029.qml
index 000a7568b..000a7568b 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_1029.qml
+++ b/sources/pyside2/tests/QtQml/bug_1029.qml
diff --git a/sources/pyside2/tests/QtQml/bug_451.py b/sources/pyside2/tests/QtQml/bug_451.py
index 5a6df7ff2..5a6df7ff2 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_451.py
+++ b/sources/pyside2/tests/QtQml/bug_451.py
diff --git a/sources/pyside2/tests/QtQml/bug_451.qml b/sources/pyside2/tests/QtQml/bug_451.qml
index 71bf691b4..71bf691b4 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_451.qml
+++ b/sources/pyside2/tests/QtQml/bug_451.qml
diff --git a/sources/pyside2/tests/QtQml/bug_456.py b/sources/pyside2/tests/QtQml/bug_456.py
index 9c94e76a6..9c94e76a6 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_456.py
+++ b/sources/pyside2/tests/QtQml/bug_456.py
diff --git a/sources/pyside2/tests/QtQml/bug_456.qml b/sources/pyside2/tests/QtQml/bug_456.qml
index 9b1b8c03c..9b1b8c03c 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_456.qml
+++ b/sources/pyside2/tests/QtQml/bug_456.qml
diff --git a/sources/pyside2/tests/QtQml/bug_557.py b/sources/pyside2/tests/QtQml/bug_557.py
index bc18ba2a2..bc18ba2a2 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_557.py
+++ b/sources/pyside2/tests/QtQml/bug_557.py
diff --git a/sources/pyside2/tests/QtQml/bug_726.py b/sources/pyside2/tests/QtQml/bug_726.py
index 20fa4d196..20fa4d196 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_726.py
+++ b/sources/pyside2/tests/QtQml/bug_726.py
diff --git a/sources/pyside2/tests/QtQml/bug_726.qml b/sources/pyside2/tests/QtQml/bug_726.qml
index 79f960243..79f960243 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_726.qml
+++ b/sources/pyside2/tests/QtQml/bug_726.qml
diff --git a/sources/pyside2/tests/QtQml/bug_814.py b/sources/pyside2/tests/QtQml/bug_814.py
index 31eada2df..31eada2df 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_814.py
+++ b/sources/pyside2/tests/QtQml/bug_814.py
diff --git a/sources/pyside2/tests/QtQml/bug_814.qml b/sources/pyside2/tests/QtQml/bug_814.qml
index 411896770..411896770 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_814.qml
+++ b/sources/pyside2/tests/QtQml/bug_814.qml
diff --git a/sources/pyside2/tests/QtQml/bug_825.py b/sources/pyside2/tests/QtQml/bug_825.py
index fe67f64b9..fe67f64b9 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_825.py
+++ b/sources/pyside2/tests/QtQml/bug_825.py
diff --git a/sources/pyside2/tests/QtQml/bug_825.qml b/sources/pyside2/tests/QtQml/bug_825.qml
index 6ae06d5b8..6ae06d5b8 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_825.qml
+++ b/sources/pyside2/tests/QtQml/bug_825.qml
diff --git a/sources/pyside2/tests/QtQml/bug_847.py b/sources/pyside2/tests/QtQml/bug_847.py
index c38278537..c38278537 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_847.py
+++ b/sources/pyside2/tests/QtQml/bug_847.py
diff --git a/sources/pyside2/tests/QtQml/bug_847.qml b/sources/pyside2/tests/QtQml/bug_847.qml
index 3833b1637..3833b1637 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_847.qml
+++ b/sources/pyside2/tests/QtQml/bug_847.qml
diff --git a/sources/pyside2/tests/QtQml/bug_915.py b/sources/pyside2/tests/QtQml/bug_915.py
index b0f231aee..b0f231aee 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_915.py
+++ b/sources/pyside2/tests/QtQml/bug_915.py
diff --git a/sources/pyside2/tests/QtQml/bug_926.py b/sources/pyside2/tests/QtQml/bug_926.py
index 6eef7b1a7..6eef7b1a7 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_926.py
+++ b/sources/pyside2/tests/QtQml/bug_926.py
diff --git a/sources/pyside2/tests/QtQml/bug_926.qml b/sources/pyside2/tests/QtQml/bug_926.qml
index 9217403a4..9217403a4 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_926.qml
+++ b/sources/pyside2/tests/QtQml/bug_926.qml
diff --git a/sources/pyside2/tests/QtQml/bug_951.py b/sources/pyside2/tests/QtQml/bug_951.py
index 38cf597ef..38cf597ef 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_951.py
+++ b/sources/pyside2/tests/QtQml/bug_951.py
diff --git a/sources/pyside2/tests/QtQml/bug_951.qml b/sources/pyside2/tests/QtQml/bug_951.qml
index 8242223f9..8242223f9 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_951.qml
+++ b/sources/pyside2/tests/QtQml/bug_951.qml
diff --git a/sources/pyside2/tests/QtQml/bug_995.py b/sources/pyside2/tests/QtQml/bug_995.py
index 7363f0e1b..7363f0e1b 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_995.py
+++ b/sources/pyside2/tests/QtQml/bug_995.py
diff --git a/sources/pyside2/tests/QtQml/bug_995.qml b/sources/pyside2/tests/QtQml/bug_995.qml
index 1369dcca6..1369dcca6 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_995.qml
+++ b/sources/pyside2/tests/QtQml/bug_995.qml
diff --git a/sources/pyside2/tests/QtQml/bug_997.py b/sources/pyside2/tests/QtQml/bug_997.py
index 45c777f8b..45c777f8b 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_997.py
+++ b/sources/pyside2/tests/QtQml/bug_997.py
diff --git a/sources/pyside2/tests/QtQml/bug_997.qml b/sources/pyside2/tests/QtQml/bug_997.qml
index f36a7e8f8..f36a7e8f8 100755..100644
--- a/sources/pyside2/tests/QtQml/bug_997.qml
+++ b/sources/pyside2/tests/QtQml/bug_997.qml
diff --git a/sources/pyside2/tests/QtQml/connect_python_qml.qml b/sources/pyside2/tests/QtQml/connect_python_qml.qml
index 249debf91..249debf91 100755..100644
--- a/sources/pyside2/tests/QtQml/connect_python_qml.qml
+++ b/sources/pyside2/tests/QtQml/connect_python_qml.qml
diff --git a/sources/pyside2/tests/QtQml/hw.qml b/sources/pyside2/tests/QtQml/hw.qml
index 8b086f31f..8b086f31f 100755..100644
--- a/sources/pyside2/tests/QtQml/hw.qml
+++ b/sources/pyside2/tests/QtQml/hw.qml
diff --git a/sources/pyside2/tests/QtQml/qqmlnetwork_test.py b/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
index 3e6d1c2aa..3e6d1c2aa 100755..100644
--- a/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
+++ b/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
diff --git a/sources/pyside2/tests/QtQml/qquickview_test.py b/sources/pyside2/tests/QtQml/qquickview_test.py
index 62b20738f..62b20738f 100755..100644
--- a/sources/pyside2/tests/QtQml/qquickview_test.py
+++ b/sources/pyside2/tests/QtQml/qquickview_test.py
diff --git a/sources/pyside2/tests/QtQml/registertype.py b/sources/pyside2/tests/QtQml/registertype.py
index 5be65b7bd..5be65b7bd 100755..100644
--- a/sources/pyside2/tests/QtQml/registertype.py
+++ b/sources/pyside2/tests/QtQml/registertype.py
diff --git a/sources/pyside2/tests/QtQml/registertype.qml b/sources/pyside2/tests/QtQml/registertype.qml
index c41226016..c41226016 100755..100644
--- a/sources/pyside2/tests/QtQml/registertype.qml
+++ b/sources/pyside2/tests/QtQml/registertype.qml
diff --git a/sources/pyside2/tests/QtQml/signal_arguments.py b/sources/pyside2/tests/QtQml/signal_arguments.py
index 096fa6882..096fa6882 100755..100644
--- a/sources/pyside2/tests/QtQml/signal_arguments.py
+++ b/sources/pyside2/tests/QtQml/signal_arguments.py
diff --git a/sources/pyside2/tests/QtQml/view.qml b/sources/pyside2/tests/QtQml/view.qml
index dcc0076a0..dcc0076a0 100755..100644
--- a/sources/pyside2/tests/QtQml/view.qml
+++ b/sources/pyside2/tests/QtQml/view.qml
diff --git a/sources/pyside2/tests/QtQml/viewmodel.qml b/sources/pyside2/tests/QtQml/viewmodel.qml
index 61366a73e..61366a73e 100755..100644
--- a/sources/pyside2/tests/QtQml/viewmodel.qml
+++ b/sources/pyside2/tests/QtQml/viewmodel.qml