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

Change-Id: I1bc352322e41c3288a8a6f93dc2873e393607d72

2 files changed, 15 insertions, 3 deletions

diff --git a/sources/pyside2/tests/QtCore/qmimedatabase_test.py b/sources/pyside2/tests/QtCore/qmimedatabase_test.py
index 7bd9a4586..4c3ae220d 100644
--- a/sources/pyside2/tests/QtCore/qmimedatabase_test.py
+++ b/sources/pyside2/tests/QtCore/qmimedatabase_test.py
@@ -34,7 +34,7 @@ import unittest
 import ctypes
 import sys
 
-from PySide2.QtCore import QMimeDatabase
+from PySide2.QtCore import QMimeDatabase, QLocale
 
 class QMimeDatabaseTest(unittest.TestCase):
     def testMimeTypeForName(self):
@@ -43,7 +43,8 @@ class QMimeDatabaseTest(unittest.TestCase):
         s0 = db.mimeTypeForName("application/x-zerosize")
         self.assertTrue(s0.isValid())
         self.assertEqual(s0.name(), "application/x-zerosize")
-        self.assertEqual(s0.comment(), "empty document")
+        if "en" in QLocale().name():
+            self.assertEqual(s0.comment(), "empty document")
 
         s0Again = db.mimeTypeForName("application/x-zerosize")
         self.assertEqual(s0Again.name(), s0.name())
diff --git a/sources/pyside2/tests/QtCore/qobject_test.py b/sources/pyside2/tests/QtCore/qobject_test.py
index 482ae78be..bafa8a643 100644
--- a/sources/pyside2/tests/QtCore/qobject_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_test.py
@@ -34,7 +34,12 @@
 import unittest
 import py3kcompat as py3k
 
-from PySide2.QtCore import QObject
+from PySide2.QtCore import QObject, Signal, Qt
+
+class Obj(QObject):
+    signal = Signal()
+    def empty(self):
+        pass
 
 class ObjectNameCase(unittest.TestCase):
     '''Tests related to QObject object name'''
@@ -67,6 +72,12 @@ class ObjectNameCase(unittest.TestCase):
         obj.setObjectName(name)
         self.assertEqual(obj.objectName(), name)
 
+    def testUniqueConnection(self):
+        obj = Obj()
+        # On first connect, UniqueConnection returns True, and on the second
+        # it must return False, and not a RuntimeError (PYSIDE-34)
+        self.assertTrue(obj.signal.connect(obj.empty, Qt.UniqueConnection))
+        self.assertFalse(obj.signal.connect(obj.empty, Qt.UniqueConnection))
 
 if __name__ == '__main__':
     unittest.main()