Merge remote-tracking branch 'origin/6.3' into wip/6.3_pypy

Change-Id: I049daa7bbac16b4cf680dc60d65553277064b231

1 files changed, 14 insertions, 1 deletions

diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
index 63cb423c1..f1148eaaf 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
@@ -61,7 +61,7 @@ class ellipsis(object):
         return "..."
 
 ellipsis = ellipsis()
-Point = typing.Tuple[float, float]
+Point = typing.Tuple[int, int]
 Variant = typing.Any
 QImageCleanupFunction = typing.Callable
 
@@ -318,6 +318,8 @@ type_map.update({
     "zero(str)": "",
     "zero(typing.Any)": None,
     "zero(Any)": None,
+    # This can be refined by importing numpy.typing optionally, but better than nothing.
+    "numpy.ndarray": typing.List[typing.Any],
     })
 
 type_map.update({
@@ -692,9 +694,20 @@ def init_PySide6_QtBluetooth():
     return locals()
 
 
+def init_PySide6_QtHttpServer():
+    type_map.update({
+        "qMakePair(1u, 1u)": (1, 1),
+    })
+    return locals()
+
+
 def init_testbinding():
     type_map.update({
         "testbinding.PySideCPP2.TestObjectWithoutNamespace": testbinding.TestObjectWithoutNamespace,
+        "testbinding.FlagsNamespace.Options": testbinding.Option,
+        "FlagsNamespace.Option.NoOptions": 0,
+        "StdIntList": typing.List[int],
+        'Str("")': str(""),
     })
     return locals()