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-04 10:52:41 +0100 |
| commit | 90c19c81fa9de2bc300ef4692b820dbccee6f428 (patch) | |
| tree | 0fb95837ba7201bfcf2eb73922e9562ab4ed53ba | |
| parent | 3411bfc4a08e12df7ffa0d5604a62f5ea8f4693a (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.
Fixes: PYSIDE-1410
Change-Id: I1bcffd34486d5ceebdeea3af47f42398896e9575
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 27aa24e589ca293298f88f3fd0d027d9f95dedc5)
| -rw-r--r-- | sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml b/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml index 19856a754..e6c8def4a 100644 --- a/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml +++ b/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml @@ -48,7 +48,13 @@ <rejection class="*" function-name="qt_static_metacall"/> <rejection class="*" field-name="qt_meta_stringdata_QAxBase"/> <rejection class="*" field-name="qt_meta_data_QAxBase"/> - <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="QAxObject"/> <object-type name="QAxScript"> <enum-type name="FunctionFlags"/> |