diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtWidgets')
| -rw-r--r-- | sources/pyside6/PySide6/QtWidgets/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml | 47 |
2 files changed, 30 insertions, 18 deletions
diff --git a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt index 3f960bcff..85d4cdfd2 100644 --- a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt @@ -37,6 +37,7 @@ ${QtWidgets_GEN_DIR}/qfocusframe_wrapper.cpp ${QtWidgets_GEN_DIR}/qfontcombobox_wrapper.cpp ${QtWidgets_GEN_DIR}/qfontdialog_wrapper.cpp ${QtWidgets_GEN_DIR}/qformlayout_wrapper.cpp +${QtWidgets_GEN_DIR}/qformlayout_takerowresult_wrapper.cpp ${QtWidgets_GEN_DIR}/qframe_wrapper.cpp ${QtWidgets_GEN_DIR}/qgesture_wrapper.cpp ${QtWidgets_GEN_DIR}/qgestureevent_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml index 55d45d068..1c0d4d706 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml @@ -219,7 +219,7 @@ <value-type name="QSizePolicy"> <enum-type name="ControlType" flags="ControlTypes"/> <enum-type name="Policy"/> - <enum-type name="PolicyFlag"/> + <enum-type name="PolicyFlag" python-type="IntFlag"/> </value-type> <value-type name="QTableWidgetSelectionRange"/> @@ -509,7 +509,7 @@ </object-type> <object-type name="QDateEdit"/> <object-type name="QDialog"> - <enum-type name="DialogCode"/> + <enum-type name="DialogCode" python-type="IntEnum"/> <modify-function signature="exec()" allow-thread="yes"/> <add-function signature="exec_()" return-type="int"> <inject-code file="../glue/qtwidgets.cpp" snippet="qapplication-exec"/> @@ -904,7 +904,6 @@ </object-type> <object-type name="QMenuBar"> - <inject-code class="native" position="beginning" file="../glue/qtwidgets.cpp" snippet="qwidget-addaction-glue"/> <modify-function signature="addMenu(QMenu*)"> <modify-argument index="return"> <parent index="1" action="add"/> @@ -1154,17 +1153,17 @@ </add-function> </object-type> <object-type name="QStyle"> - <enum-type name="ComplexControl"/> - <enum-type name="ContentsType"/> - <enum-type name="ControlElement"/> - <enum-type name="PixelMetric"/> - <enum-type name="PrimitiveElement"/> + <enum-type name="ComplexControl" python-type="IntEnum"/> + <enum-type name="ContentsType" python-type="IntEnum"/> + <enum-type name="ControlElement" python-type="IntEnum"/> + <enum-type name="PixelMetric" python-type="IntEnum"/> + <enum-type name="PrimitiveElement" python-type="IntEnum"/> <enum-type name="RequestSoftwareInputPanel" since="4.6"/> - <enum-type name="StandardPixmap"/> + <enum-type name="StandardPixmap" python-type="IntEnum"/> <enum-type name="StateFlag" flags="State"/> - <enum-type name="StyleHint"/> + <enum-type name="StyleHint" python-type="IntEnum"/> <enum-type name="SubControl" flags="SubControls"/> - <enum-type name="SubElement"/> + <enum-type name="SubElement" python-type="IntEnum"/> <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const"> <modify-argument index="3" invalidate-after-use="yes"/> <modify-argument index="4"> @@ -1782,7 +1781,7 @@ <modify-function signature="closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)" allow-thread="yes"/> </object-type> <object-type name="QTableWidgetItem" > - <enum-type name="ItemType"/> + <enum-type name="ItemType" python-type="IntEnum"/> <modify-function signature="read(QDataStream&)" allow-thread="yes"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> @@ -1791,7 +1790,7 @@ </modify-function> </object-type> <object-type name="QListWidgetItem" > - <enum-type name="ItemType"/> + <enum-type name="ItemType" python-type="IntEnum"/> <modify-function signature="QListWidgetItem(const QString&,QListWidget*,int)"> <modify-argument index="this"> <parent index="2" action="add"/> @@ -1851,7 +1850,7 @@ </object-type> <object-type name="QTreeWidgetItem" hash-function="qHash"> <enum-type name="ChildIndicatorPolicy"/> - <enum-type name="ItemType"/> + <enum-type name="ItemType" python-type="IntEnum"/> <modify-function signature="read(QDataStream&)" allow-thread="yes"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> @@ -2285,7 +2284,7 @@ <object-type name="QMessageBox"> <enum-type name="ButtonRole"/> <enum-type name="Icon"/> - <enum-type name="StandardButton" flags="StandardButtons"/> + <enum-type name="StandardButton" python-type="IntFlag" flags="StandardButtons"/> <modify-function signature="removeButton(QAbstractButton*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2295,10 +2294,19 @@ <include file-name="QPixmap" location="global"/> </extra-includes> + <!-- FIXME PYSIDE-7: Remove deprecated overloads --> <modify-function signature="critical(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="critical(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="information(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="information(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="question(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="question(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="warning(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="warning(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="QMessageBox(const QString&,const QString&,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> <modify-function signature="critical(QWidget*,const QString&,const QString&,int,int,int)" remove="all"/> <modify-function signature="critical(QWidget*,const QString&,const QString&,const QString&,const QString&,const QString&,int,int)" remove="all"/> @@ -2740,8 +2748,8 @@ </modify-function> </object-type> <object-type name="QFrame"> - <enum-type name="Shadow"/> - <enum-type name="Shape"/> + <enum-type name="Shadow" python-type="IntEnum"/> + <enum-type name="Shape" python-type="IntEnum"/> <enum-type name="StyleMask"/> </object-type> <object-type name="QSpinBox"/> @@ -2895,7 +2903,7 @@ <object-type name="QCommandLinkButton"/> <!-- FIXME PYSIDE7: Move to QtGui --> <object-type name="QFileSystemModel" polymorphic-id-expression="qobject_cast<QFileSystemModel*>(%1)"> - <enum-type name="Roles"/> + <enum-type name="Roles" python-type="IntEnum"/> <enum-type name="Option" flags="Options" since="5.14"/> <modify-function signature="setIconProvider(QAbstractFileIconProvider*)"> <modify-argument index="1"> @@ -2912,6 +2920,9 @@ <enum-type name="ItemRole"/> <enum-type name="RowWrapPolicy"/> + <value-type name="TakeRowResult"> + <include file-name="QFormLayout" location="global"/> + </value-type> <modify-function signature="getLayoutPosition(QLayout*,int*,QFormLayout::ItemRole*)const"> <modify-argument index="0"> |