diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-03 08:40:26 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-03 09:43:45 +0000 |
| commit | 27aa24e589ca293298f88f3fd0d027d9f95dedc5 (patch) | |
| tree | 9af50b0bc465522c5c0141872994353b3ad49be9 | |
| parent | 6224bbd0117b0642daf7d8cabb8ec00b4ada92ec (diff) | |
Fix QAxBase::dynamicCall(const char *, QVariantList)
When invoking QAxBase::dynamicCall(const char *, QVariantList),
the overload taking single QVariants
QAxBase::dynamicCall(const char *, QVariant1, QVariant2,...)
was chosen by the overload
decisor since QVariantList can be converted to QVariant.
Specify the order manually.
Remove the internal protected function.
Pick-to: 5.15
Fixes: PYSIDE-1410
Change-Id: I1bcffd34486d5ceebdeea3af47f42398896e9575
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside6/PySide6/QtAxContainer/typesystem_axcontainer.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtAxContainer/typesystem_axcontainer.xml b/sources/pyside6/PySide6/QtAxContainer/typesystem_axcontainer.xml index b8dfc9977..13aaab76a 100644 --- a/sources/pyside6/PySide6/QtAxContainer/typesystem_axcontainer.xml +++ b/sources/pyside6/PySide6/QtAxContainer/typesystem_axcontainer.xml @@ -47,7 +47,13 @@ <rejection class="*" function-name="qt_metacall"/> <rejection class="*" function-name="qt_static_metacall"/> - <object-type name="QAxBase"/> + <object-type name="QAxBase"> + <!-- PYSIDE-1410, Check for QVariantList first since it also is a QVariant --> + <modify-function signature="dynamicCall(const char*,QList<QVariant>&)" overload-number="0"/> + <modify-function signature="dynamicCall(const char*,const QVariant&,const QVariant&,const QVariant&,const QVariant&,const QVariant&,const QVariant&,const QVariant&,const QVariant&)" overload-number="1"/> + <!-- Remove protected, internal function --> + <modify-function signature="dynamicCall(const char*,QList<QVariant>&,unsigned)" remove="all"/> + </object-type> <object-type name="QAxBaseObject"/> <object-type name="QAxObject"/> <object-type name="QAxObjectInterface"/> |