aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-06-20 09:22:12 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-06-20 11:06:30 +0000
commit9e1ef5febe2ba7bbd53967e73b88bb28422134aa (patch)
tree3727cb4332c024b3e7027f80ebf30e63dd0205e4
parent54a8785cab070bca044ca0ceeff3219e20514a37 (diff)
Fix typing error for QQmlExpression::evaluate(bool *v)
Use Any instead of "any". Amends 3c2117c6ce31ff403fc2f17a181763057cd2e1bc. Task-number: PYSIDE-2285 Fixes: PYSIDE-2364 Change-Id: I1adc6c2e8e4d12516c42ba09b9431638423af1d3 Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> (cherry picked from commit 6bcc55e3287cb2e5f9914834bb6514d4d2aca0b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/QtQml/typesystem_qml.xml2
-rw-r--r--sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
index 6c8273b14..6947dec9c 100644
--- a/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
+++ b/sources/pyside6/PySide6/QtQml/typesystem_qml.xml
@@ -195,7 +195,7 @@
<modify-argument index="1">
<remove-argument />
</modify-argument>
- <modify-argument index="return" pyi-type="Tuple[any, bool]">
+ <modify-argument index="return" pyi-type="Tuple[Any, bool]">
<replace-type modified-type="PyTuple"/>
</modify-argument>
<inject-code class="target" position="beginning">
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
index d644294bd..64ae7cf71 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
@@ -186,6 +186,7 @@ namespace = globals() # our module's __dict__
type_map.update({
"...": ellipsis,
+ "Any": typing.Any,
"bool": bool,
"char": int,
"double": float,