Merge tag 'v5.15.6-lts' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl

Qt For Python Release 5.15.6

Change-Id: I7a6874dfca79fbc46f5a6101e713b0c1dde9a640

1 files changed, 15 insertions, 1 deletions

diff --git a/sources/pyside2/tests/QtCore/qsettings_test.py b/sources/pyside2/tests/QtCore/qsettings_test.py
index a9f42a5d5..d7e203734 100644
--- a/sources/pyside2/tests/QtCore/qsettings_test.py
+++ b/sources/pyside2/tests/QtCore/qsettings_test.py
@@ -38,7 +38,7 @@ init_test_paths(False)
 
 from helper.helper import adjust_filename
 import py3kcompat as py3k
-from PySide2.QtCore import QDir, QSettings, QTemporaryDir
+from PySide2.QtCore import QDir, QSettings, QTemporaryDir, QByteArray
 
 class TestQSettings(unittest.TestCase):
     def testConversions(self):
@@ -57,6 +57,20 @@ class TestQSettings(unittest.TestCase):
         r = settings.value('var2', type=list)
         self.assertEqual(type(r), list)
 
+        # Test mixed conversions
+        if py3k.IS_PY3K:
+            ba = QByteArray("hello".encode("utf-8"))
+
+            r = settings.value("test", ba, type=QByteArray)
+            self.assertEqual(type(r), QByteArray)
+
+            r = settings.value("test", ba, type=str)
+            self.assertEqual(type(r), str)
+
+            # Test invalid conversions
+            with self.assertRaises(TypeError):
+                r = settings.value("test", ba, type=dict)
+
 
     def testDefaultValueConversion(self):
         temp_dir = QDir.tempPath()