diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-06 08:55:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-07 11:12:55 +0000 |
| commit | efffa046b8aed56a832f5159ca172e0393c24f1d (patch) | |
| tree | edfe1f95b6045f53b9857a64a61cf75ed9d72de4 /sources/pyside2/PySide2 | |
| parent | 018207374a4640f2caa961a7b2455e9d7ca60894 (diff) | |
Fix further tests
- Remove bug_632.py which was testing removed function
QLineEdit::getTextMargins()
- Enable the qshortcut test
- Remove check for QWidget::getContentsMargins() from
returnquadruplesofnumbers_test.py
- Adapt error message in qdomdocument_test.py
- QByteArray: exclude overloads of number functions added by
qtbase/66d6943478c3ae76f996c2cd2fdf04fee4fcb767.
As a drive by, remove operator[](uint).
Change-Id: I8f40dad1c1a446865e9de34a5df293cce09a1510
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 5 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 216b02a4d..b8a78f8de 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1929,15 +1929,18 @@ <modify-function signature="operator>(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator[](int)const" remove="all"/> - <modify-function signature="operator[](uint)const" remove="all"/> <!-- Those types have the same representation in Python, an overload would be useless and cause overflow errors. --> <modify-function signature="setNum(uint,int)" remove="all"/> <modify-function signature="setNum(ushort,int)" remove="all"/> <modify-function signature="setNum(float,char,int)" remove="all"/> <modify-function signature="setNum(short,int)" remove="all"/> + <modify-function signature="setNum(long,int)" remove="all"/> + <modify-function signature="setNum(ulong,int)" remove="all"/> <modify-function signature="setNum(qulonglong,int)" remove="all"/> <modify-function signature="number(uint,int)" remove="all"/> + <modify-function signature="number(long,int)" remove="all"/> + <modify-function signature="number(ulong,int)" remove="all"/> <modify-function signature="number(qulonglong,int)" remove="all"/> <!--### --> diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 3819c2a42..06ea29d14 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -272,15 +272,13 @@ </modify-function> </object-type> <object-type name="QShortcut"> -<!-- FIXME: Qt 6 - <add-function signature="QShortcut(QKeySequence&,QWidget*,PyCallable*,Qt::ShortcutContext)"> + <add-function signature="QShortcut(QKeySequence&,QObject*,PyCallable*,Qt::ShortcutContext)"> <modify-argument index="4"> <replace-default-expression with="Qt::WindowShortcut"/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qshortcut-1"/> <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qshortcut-2"/> </add-function> ---> </object-type> <value-type name="QTransform"> |