diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-03 11:27:58 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-05 15:09:40 +0000 |
| commit | 3fbc9599fba7f76d081cda6a55294bd130bead4a (patch) | |
| tree | 8ee3f6fa50334808d59f8728b388e554f9e50227 /sources/pyside6/PySide6 | |
| parent | 53e1a5f8a22faee31015a06c1cfcb8cac0ae0ff2 (diff) | |
Further adaptations to Qt 6
- Remove QPrinter::getPageMargins()
- Fix qcollator test, adapting to
qtbase/3a1bc4bad5757d72e5af8b4abe236e3cfac9621d.
- Add new QShortcut constructor, adapting to
qtbase/b26fa9722f9e8c81406259f6db8044e8bbc2d50b
Change-Id: I92b2b54fbe5a93ac40a8ad69589f9317df03b4ad
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6')
| -rw-r--r-- | sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml | 7 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport_common.xml | 22 |
2 files changed, 7 insertions, 22 deletions
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index f4447454d..f6a03a79a 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -209,6 +209,13 @@ <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> + <add-function signature="QShortcut(QKeySequence::StandardKey,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"> diff --git a/sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport_common.xml b/sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport_common.xml index 7ea9c06ff..586b63ce5 100644 --- a/sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport_common.xml +++ b/sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport_common.xml @@ -71,28 +71,6 @@ <enum-type name="PrinterMode"/> <enum-type name="PrinterState"/> <enum-type name="Unit"/> - <modify-function signature="getPageMargins(qreal*,qreal*,qreal*,qreal*,QPrinter::Unit)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*,args"> - <replace from="$TYPE" to="qreal"/> - </insert-template> - </inject-code> - </modify-function> <modify-function signature="setEngines(QPrintEngine*,QPaintEngine*)"> <modify-argument index="1"> <parent index="this" action="add"/> |