diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml')
| -rw-r--r-- | sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml | 669 |
1 files changed, 381 insertions, 288 deletions
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index d356034ec..3eee63ba4 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -10,26 +10,6 @@ <load-typesystem name="templates/gui_common.xml" generate="no"/> <load-typesystem name="templates/opengl_common.xml" generate="no"/> - <?if !darwin?> - <?entity GLint int?> - <?entity GLuint unsigned int?> - <?entity GLbyte unsigned char?> - <?entity GLboolean unsigned char?> - <?entity GLsizei int?> - <?entity GLsizeiptr long?> - <?entity GLintptr long?> - <?endif?> - - <?if darwin?> - <?entity GLint int32_t?> - <?entity GLuint uint32_t?> - <?entity GLbyte uint8_t?> - <?entity GLboolean uint8_t?> - <?entity GLsizei int32_t?> - <?entity GLsizeiptr intptr_t?> - <?entity GLintptr intptr_t?> - <?endif?> - <rejection class="^Q.*$" argument-type="^QPlatform.*$"/> <function signature="qAlpha(uint)"/> <function signature="qBlue(uint)"/> @@ -60,33 +40,9 @@ <function signature="qPixelFormatHsl(uchar,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition,QPixelFormat::TypeInterpretation)"/> <function signature="qPixelFormatHsv(uchar,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition,QPixelFormat::TypeInterpretation)"/> <function signature="qPixelFormatYuv(QPixelFormat::YUVLayout,uchar,QPixelFormat::AlphaUsage,QPixelFormat::AlphaPosition,QPixelFormat::AlphaPremultiplied,QPixelFormat::TypeInterpretation,QPixelFormat::ByteOrder)"/> - <rejection class="*" function-name="qobject_interface_iid<QStyleFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QAccessibleFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QInputContextFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QGraphicsItem*>"/> - <rejection class="*" function-name="qobject_interface_iid<QGraphicsLayout*>"/> - <rejection class="*" function-name="qobject_interface_iid<QAccessibleBridgeFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QImageIOHandlerFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QAccessibleInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QTextObjectInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QGraphicsLayoutItem*>"/> - <rejection class="*" function-name="qobject_interface_iid<QIconEngineFactoryInterface*>"/> - <rejection class="*" function-name="qobject_interface_iid<QPictureFormatInterface*>"/> - - <rejection class="*" function-name="qobject_cast<QGraphicsLayout*>"/> - <rejection class="*" function-name="qobject_cast<QGraphicsItem*>"/> - <rejection class="*" function-name="qobject_cast<QGraphicsLayoutItem*>"/> - <rejection class="*" function-name="qobject_cast<QGraphicsLayoutItem*>"/> - - <rejection class="*" function-name="qGenericMatrixFromMatrix4x4"/> - <rejection class="*" function-name="qDrawBorderPixmap"/> - <rejection class="*" function-name="qDrawPixmaps"/> - <rejection class="*" function-name="qGenericMatrixToMatrix4x4"/> - - <rejection class="*" function-name="d_func"/> - <rejection class="*" field-name="d_ptr"/> - <rejection class="*" field-name="d"/> - <rejection class="^QOpenGL.*$" argument-type="^(const )?GLboolean ?\*$"/> + <function signature="qt_set_sequence_auto_mnemonic(bool)"/> + + <rejection class="^QOpenGL.*$" argument-type="^const GLboolean ?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^GLchar\*$"/> <rejection class="^QOpenGL.*$" argument-type="^(const )?GLchar ?\*(const)?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^char\*$"/> @@ -104,8 +60,6 @@ <rejection class="^QOpenGL.*$" argument-type="^(const )?QVector.D ?\*$"/> <rejection class="^QOpenGL.*$" argument-type="^(const )?void ?\*\*$"/> - <rejection class="QDrawBorderPixmap"/> - <!-- Event classes have a lot of non-documented protected fields, those fields are removed from PySide because they are Qt implementation details, @@ -113,21 +67,17 @@ --> <rejection class="^Q.*Event$" field-name="^m_.*$"/> - <rejection class="QEventPoint" field-name="^m_.*$"/> - <rejection class="QAbstractTextDocumentLayout::PaintContext" field-name="selections"/> - <rejection class="QBrush" function-name="cleanUp"/> <rejection class="QFont" enum-name="ResolveProperties"/> - <rejection class="QMotifStyle" field-name="focus"/> - <rejection class="QPictureIO" function-name="defineIOHandler"/> <rejection class="QPolygon" function-name="putPoints"/> <rejection class="QPolygon" function-name="setPoints"/> <rejection class="QPolygon" function-name="setPoint"/> - <rejection class="QPolygon" function-name="points"/> <rejection class="QPolygon" function-name="point"/> - <rejection class="QActionGroup" function-name="selected"/> <rejection class="QPaintEngine" function-name="fix_neg_rect"/> + <inject-code class="native" position="beginning" file="../glue/qtgui.cpp" + snippet="gui-declarations"/> + <!-- For Qt::mightBeRichText(QString), Qt::convertFromPlainText(QString,Qt::WhiteSpaceMode) Match on files from '/QtGui/' (shadow build) or '/gui/' (developer build) or '/QtGui.framework' (macOS) --> @@ -142,7 +92,7 @@ </conversion-rule> </primitive-type> - <object-type name="QAbstractFileIconProvider" since="6.0"> + <object-type name="QAbstractFileIconProvider"> <enum-type name="IconType"/> <enum-type name="Option" flags="Options"/> </object-type> @@ -176,17 +126,26 @@ <object-type name="QAccessibleTextInterface"/> <object-type name="QAccessibleValueInterface"/> - <object-type name="QAccessibleEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::InvalidEvent"/> - <object-type name="QAccessibleStateChangeEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::StateChanged"/> - <object-type name="QAccessibleTableModelChangeEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::TableModelChanged"> + <object-type name="QAccessibleEvent" + polymorphic-id-expression="%B->type() == QAccessible::InvalidEvent"/> + <object-type name="QAccessibleStateChangeEvent" + polymorphic-id-expression="%B->type() == QAccessible::StateChanged"/> + <object-type name="QAccessibleTableModelChangeEvent" + polymorphic-id-expression="%B->type() == QAccessible::TableModelChanged"> <enum-type name="ModelChangeType"/> </object-type> - <object-type name="QAccessibleTextCursorEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::TextCaretMoved"/> - <object-type name="QAccessibleTextInsertEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::TextInserted"/> - <object-type name="QAccessibleTextRemoveEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::TextRemoved"/> - <object-type name="QAccessibleTextSelectionEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::TextSelectionChanged"/> - <object-type name="QAccessibleTextUpdateEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::TextUpdated"/> - <object-type name="QAccessibleValueChangeEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::ValueChanged"/> + <object-type name="QAccessibleTextCursorEvent" + polymorphic-id-expression="%B->type() == QAccessible::TextCaretMoved"/> + <object-type name="QAccessibleTextInsertEvent" + polymorphic-id-expression="%B->type() == QAccessible::TextInserted"/> + <object-type name="QAccessibleTextRemoveEvent" + polymorphic-id-expression="%B->type() == QAccessible::TextRemoved"/> + <object-type name="QAccessibleTextSelectionEvent" + polymorphic-id-expression="%B->type() == QAccessible::TextSelectionChanged"/> + <object-type name="QAccessibleTextUpdateEvent" + polymorphic-id-expression="%B->type() == QAccessible::TextUpdated"/> + <object-type name="QAccessibleValueChangeEvent" + polymorphic-id-expression="%B->type() == QAccessible::ValueChanged"/> <object-type name="QAction"> <enum-type name="ActionEvent"/> @@ -207,7 +166,7 @@ </add-function> </object-type> <object-type name="QActionGroup"> - <enum-type name="ExclusionPolicy" since="5.14"/> + <enum-type name="ExclusionPolicy"/> <modify-function signature="addAction(QAction*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -276,7 +235,7 @@ <modify-argument index="1"> <remove-argument/> </modify-argument> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[PySide6.QtGui.QTransform, bool]"> <replace-type modified-type="PyTuple"/> </modify-argument> <inject-code class="target" position="beginning"> @@ -316,7 +275,8 @@ <value-type name="QTextInlineObject"/> <value-type name="QTextDocumentFragment"/> <value-type name="QTextOption"> - <enum-type name="Flag" flags="Flags"/> + <!-- PYSIDE-2088, Avoid MSVC signedness issues --> + <enum-type name="Flag" flags="Flags" cpp-type="unsigned"/> <enum-type name="TabType"/> <enum-type name="WrapMode"/> <value-type name="Tab"/> @@ -365,9 +325,7 @@ <enum-type name="StandardKey"/> <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="qkeysequence_repr"/> - </inject-code> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qkeysequence-repr"/> </add-function> <add-function signature="__reduce__" return-type="PyObject*"> @@ -471,7 +429,7 @@ </value-type> <value-type name="QTextBlockFormat"> <enum-type name="LineHeightTypes" since="4.8" revision="4800"/> - <enum-type name="MarkerType" since="5.14"/> + <enum-type name="MarkerType"/> </value-type> <value-type name="QTextTableCellFormat"/> <value-type name="QTextCharFormat" > @@ -480,10 +438,10 @@ <enum-type name="VerticalAlignment"/> </value-type> <value-type name="QTextFormat" > - <enum-type name="FormatType"/> - <enum-type name="ObjectTypes"/> + <enum-type name="FormatType" python-type="IntEnum"/> + <enum-type name="ObjectTypes" python-type="IntEnum"/> <enum-type name="PageBreakFlag" flags="PageBreakFlags"/> - <enum-type name="Property"/> + <enum-type name="Property" python-type="IntEnum"/> </value-type> <value-type name="QTextListFormat"> <enum-type name="Style"/> @@ -531,6 +489,7 @@ <value-type name="QIcon" > <enum-type name="Mode"/> <enum-type name="State"/> + <enum-type name="ThemeIcon" since="6.7"/> <modify-function signature="QIcon(QIconEngine*)"> <modify-argument index="1"> <no-null-pointer/> @@ -651,21 +610,22 @@ </modify-function> </value-type> - <value-type name="QConicalGradient" polymorphic-id-expression="%1->type() == QGradient::ConicalGradient"/> + <value-type name="QConicalGradient" polymorphic-id-expression="%B->type() == QGradient::ConicalGradient"/> <value-type name="QFontInfo"/> - <value-type name="QRadialGradient" polymorphic-id-expression="%1->type() == QGradient::RadialGradient"/> + <value-type name="QRadialGradient" polymorphic-id-expression="%B->type() == QGradient::RadialGradient"/> <value-type name="QFont" > <enum-type name="Capitalization"/> <enum-type name="SpacingType"/> - <enum-type name="Stretch"/> + <enum-type name="Stretch" python-type="IntEnum"/> <enum-type name="Style"/> <enum-type name="StyleHint"/> - <enum-type name="StyleStrategy"/> - <enum-type name="Weight"/> + <enum-type name="StyleStrategy" python-type="Flag"/> + <enum-type name="Weight" python-type="IntEnum"/> <enum-type name="HintingPreference" since="4.8" revision="4800"/> <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> + <value-type name="Tag" since="6.7"/> <!-- PYSIDE-1685: QFont(QString) should be checked first, else it will be interpreted as sequence --> <modify-function signature="QFont(const QString&,int,int, bool)" overload-number="0"/> <modify-function signature="QFont(const QStringList &,int,int, bool)" overload-number="1"/> @@ -721,7 +681,7 @@ </inject-code> </modify-function> - <modify-function signature="QImage(const QString&, const char *)"> + <modify-function signature="QImage(const QString&, const char *)" allow-thread="yes"> <modify-argument index="1"><replace-type modified-type="PyPathLike"/></modify-argument> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qfile-path-1"/> </modify-function> @@ -1044,18 +1004,18 @@ </modify-function> </value-type> - <namespace-type name="QColorConstants" since="5.14"> + <namespace-type name="QColorConstants"> <extra-includes> <include file-name="QColor" location="global"/> </extra-includes> - <namespace-type name="Svg" since="5.14"> + <namespace-type name="Svg"> <extra-includes> <include file-name="QColor" location="global"/> </extra-includes> </namespace-type> </namespace-type> - <value-type name="QColorSpace" since="5.14"> + <value-type name="QColorSpace"> <enum-type name="NamedColorSpace"/> <enum-type name="Primaries"/> <enum-type name="TransferFunction"/> @@ -1145,19 +1105,19 @@ <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetrics-size"/> </modify-function> </value-type> - <value-type name="QGradient" polymorphic-id-expression="%1->type() == QGradient::NoGradient"> + <value-type name="QGradient" polymorphic-id-expression="%B->type() == QGradient::NoGradient"> <enum-type name="CoordinateMode"/> <enum-type name="InterpolationMode"/> - <enum-type name="Preset" since="5.12"/> + <enum-type name="Preset"/> <enum-type name="Spread"/> <enum-type name="Type"/> </value-type> - <value-type name="QLinearGradient" polymorphic-id-expression="%1->type() == QGradient::LinearGradient"/> + <value-type name="QLinearGradient" polymorphic-id-expression="%B->type() == QGradient::LinearGradient"/> <object-type name="QPaintDevice"> <enum-type name="PaintDeviceMetric"/> </object-type> <object-type name="QPagedPaintDevice"> - <enum-type name="PdfVersion" since="5.10"/> + <enum-type name="PdfVersion"/> </object-type> <object-type name="QAbstractTextDocumentLayout"> <value-type name="PaintContext" > @@ -1298,9 +1258,6 @@ <define-ownership class="target" owner="target"/> </modify-argument> </modify-function> - - <!-- ??? --> - <modify-function signature="operator<(QStandardItem)const" remove="all"/> </object-type> <object-type name="QSyntaxHighlighter"> <modify-function signature="setCurrentBlockUserData(QTextBlockUserData*)"> @@ -1309,7 +1266,7 @@ </modify-argument> </modify-function> <modify-function signature="setDocument(QTextDocument*)"> - <modify-argument index="1"> + <modify-argument index="1" pyi-type="Optional[PySide6.QtGui.QTextDocument]"> <parent index="this" action="add"/> </modify-argument> </modify-function> @@ -1356,37 +1313,38 @@ </modify-function> </object-type> - <object-type name="QActionEvent" polymorphic-id-expression="%1->type() == QEvent::ActionAdded || %1->type() == QEvent::ActionRemoved || %1->type() == QEvent::ActionChanged"/> - <object-type name="QCloseEvent" polymorphic-id-expression="%1->type() == QEvent::Close"/> - <object-type name="QContextMenuEvent" polymorphic-id-expression="%1->type() == QEvent::ContextMenu"> + <object-type name="QActionEvent" + polymorphic-id-expression="%B->type() == QEvent::ActionAdded || %B->type() == QEvent::ActionRemoved || %B->type() == QEvent::ActionChanged"/> + <object-type name="QCloseEvent" polymorphic-id-expression="%B->type() == QEvent::Close"/> + <object-type name="QContextMenuEvent" polymorphic-id-expression="%B->type() == QEvent::ContextMenu"> <enum-type name="Reason"/> </object-type> - <value-type name="QEventPoint" since="6.0"> + <value-type name="QEventPoint"> <enum-type name="State"/> </value-type> - <object-type name="QDragEnterEvent" polymorphic-id-expression="%1->type() == QEvent::DragEnter"> + <object-type name="QDragEnterEvent" polymorphic-id-expression="%B->type() == QEvent::DragEnter"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1->type() == QEvent::DragLeave"> + <object-type name="QDragLeaveEvent" polymorphic-id-expression="%B->type() == QEvent::DragLeave"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QDragMoveEvent" polymorphic-id-expression="%1->type() == QEvent::DragMove"> + <object-type name="QDragMoveEvent" polymorphic-id-expression="%B->type() == QEvent::DragMove"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QDropEvent" polymorphic-id-expression="%1->type() == QEvent::Drop"> + <object-type name="QDropEvent" polymorphic-id-expression="%B->type() == QEvent::Drop"> <modify-function signature="source()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> @@ -1398,22 +1356,29 @@ </inject-code> </add-function> </object-type> - <object-type name="QEnterEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::Enter"/> - <object-type name="QExposeEvent" polymorphic-id-expression="%1->type() == QEvent::Expose"/> - <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> - <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> + <object-type name="QChildWindowEvent" since="6.7" + polymorphic-id-expression="%B->type() == QEvent::ChildWindowAdded || %B->type() == QEvent::ChildWindowRemoved"/> + <object-type name="QEnterEvent" + polymorphic-id-expression="%B->type() == QEvent::Enter"/> + <object-type name="QExposeEvent" polymorphic-id-expression="%B->type() == QEvent::Expose"/> + <object-type name="QFileOpenEvent" polymorphic-id-expression="%B->type() == QEvent::FileOpen"/> + <object-type name="QFocusEvent" + polymorphic-id-expression="%B->type() == QEvent::FocusIn || %B->type() == QEvent::FocusOut"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QHelpEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::ToolTip || %1->type() == QEvent::WhatsThis"/> - <object-type name="QHideEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::Hide"/> - <object-type name="QHoverEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::HoverEnter || %1->type() == QEvent::HoverLeave || %1->type() == QEvent::HoverMove"/> - <object-type name="QIconDragEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::IconDrag"/> + <object-type name="QHelpEvent" + polymorphic-id-expression="%B->type() == QEvent::ToolTip || %B->type() == QEvent::WhatsThis"/> + <object-type name="QHideEvent" polymorphic-id-expression="%B->type() == QEvent::Hide"/> + <object-type name="QHoverEvent" + polymorphic-id-expression="%B->type() == QEvent::HoverEnter || %B->type() == QEvent::HoverLeave || %B->type() == QEvent::HoverMove"/> + <object-type name="QIconDragEvent" polymorphic-id-expression="%B->type() == QEvent::IconDrag"/> - <object-type name="QInputMethodEvent" copyable="no" polymorphic-id-expression="%1->type() == QEvent::InputMethod"> + <object-type name="QInputMethodEvent" + polymorphic-id-expression="%B->type() == QEvent::InputMethod"> <!-- only declare this if ndef QT_NO_INPUTMETHOD --> <enum-type name="AttributeType"/> <value-type name="Attribute"> @@ -1426,60 +1391,68 @@ </add-function> <!-- endif ndef QT_NO_INPUTMETHOD --> </object-type> - <object-type name="QInputMethodQueryEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::InputMethodQuery"/> + <object-type name="QInputMethodQueryEvent" + polymorphic-id-expression="%B->type() == QEvent::InputMethodQuery"/> - <object-type name="QMoveEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Move"> + <object-type name="QMoveEvent" polymorphic-id-expression="%B->type() == QEvent::Move"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QNativeGestureEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::NativeGesture"/> - <object-type name="QPlatformSurfaceEvent" copyable="false" - polymorphic-id-expression="%1->type() == QEvent::PlatformSurface"> + <object-type name="QNativeGestureEvent" + polymorphic-id-expression="%B->type() == QEvent::NativeGesture"/> + <object-type name="QPlatformSurfaceEvent" + polymorphic-id-expression="%B->type() == QEvent::PlatformSurface"> <enum-type name="SurfaceEventType"/> </object-type> - <object-type name="QResizeEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Resize"> + <object-type name="QResizeEvent" polymorphic-id-expression="%B->type() == QEvent::Resize"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QShortcutEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Shortcut"> + <object-type name="QShortcutEvent" + polymorphic-id-expression="%B->type() == QEvent::Shortcut"> </object-type> - <object-type name="QShowEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Show"/> - <object-type name="QSinglePointEvent" copyable="false" since="6.0"/> - <object-type name="QStatusTipEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::StatusTip"/> - <object-type name="QTabletEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::TabletMove || %1->type() == QEvent::TabletPress || %1->type() == QEvent::TabletRelease"> + <object-type name="QShowEvent" + polymorphic-id-expression="%B->type() == QEvent::Show"/> + <object-type name="QSinglePointEvent"/> + <object-type name="QStatusTipEvent" + polymorphic-id-expression="%B->type() == QEvent::StatusTip"/> + <object-type name="QTabletEvent" + polymorphic-id-expression="%B->type() == QEvent::TabletMove || %B->type() == QEvent::TabletPress || %B->type() == QEvent::TabletRelease"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QToolBarChangeEvent" polymorphic-id-expression="%1->type() == QEvent::ToolBarChange"/> - <object-type name="QWhatsThisClickedEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::WhatsThisClicked"/> - <object-type name="QWheelEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Wheel"> + <object-type name="QToolBarChangeEvent" + polymorphic-id-expression="%B->type() == QEvent::ToolBarChange"/> + <object-type name="QWhatsThisClickedEvent" + polymorphic-id-expression="%B->type() == QEvent::WhatsThisClicked"/> + <object-type name="QWheelEvent" polymorphic-id-expression="%B->type() == QEvent::Wheel"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <!-- Qt5.5: suppress this nameless enum --> - <suppress-warning text="enum 'QWheelEvent::DefaultDeltasPerStep' does not have a type entry or is not an enum"/> - <object-type name="QWindowStateChangeEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::WindowStateChange"> + <object-type name="QWindowStateChangeEvent" + polymorphic-id-expression="%B->type() == QEvent::WindowStateChange"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QInputEvent" copyable="false"/> - <object-type name="QKeyEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::KeyPress || %1->type() == QEvent::KeyRelease || %1->type() == QEvent::ShortcutOverride"> + <object-type name="QInputEvent"/> + <object-type name="QKeyEvent" + polymorphic-id-expression="%B->type() == QEvent::KeyPress || %B->type() == QEvent::KeyRelease || %B->type() == QEvent::ShortcutOverride"> <add-function signature="operator!=(QKeySequence::StandardKey)"> <inject-code class="target" file="../glue/qtgui.cpp" snippet="qkeyevent-operatornotequal"/> </add-function> @@ -1489,8 +1462,8 @@ </inject-code> </add-function> </object-type> - <object-type name="QMouseEvent" copyable= "false" - polymorphic-id-expression="%1->type() == QEvent::MouseButtonDblClick || %1->type() == QEvent::MouseButtonPress || %1->type() == QEvent::MouseButtonRelease || %1->type() == QEvent::MouseMove"> + <object-type name="QMouseEvent" + polymorphic-id-expression="%B->type() == QEvent::MouseButtonDblClick || %B->type() == QEvent::MouseButtonPress || %B->type() == QEvent::MouseButtonRelease || %B->type() == QEvent::MouseMove"> <modify-function signature="globalPos() const" deprecated="yes"/> <modify-function signature="localPos() const" deprecated="yes"/> <modify-function signature="pos() const" deprecated="yes"/> @@ -1506,18 +1479,19 @@ </inject-code> </add-function> </object-type> - <object-type name="QPaintEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Paint"/> - <object-type name="QScrollEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::Scroll"> + <object-type name="QPaintEvent" polymorphic-id-expression="%B->type() == QEvent::Paint"/> + <object-type name="QScrollEvent" polymorphic-id-expression="%B->type() == QEvent::Scroll"> <enum-type name="ScrollState"/> </object-type> - <object-type name="QPointerEvent" copyable= "false" since="6.0"> + <object-type name="QPointerEvent" copyable= "false"> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_qdebug_gui"/> </inject-code> </add-function> </object-type> - <object-type name="QScrollPrepareEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::ScrollPrepare"/> + <object-type name="QScrollPrepareEvent" + polymorphic-id-expression="%B->type() == QEvent::ScrollPrepare"/> <object-type name="QTextFrame" > <extra-includes> @@ -1551,7 +1525,7 @@ <include file-name="QRect" location="global"/> </extra-includes> <enum-type name="ImageOption"/> - <enum-type name="Transformation" flags="Transformations" since="5.5"/> + <enum-type name="Transformation" flags="Transformations"/> <modify-function signature="setDevice(QIODevice*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -1631,7 +1605,7 @@ </add-function> </object-type> - <object-type name="QStandardItemModel" polymorphic-id-expression="qobject_cast<QStandardItemModel*>(%1)"> + <object-type name="QStandardItemModel" polymorphic-id-expression="qobject_cast<QStandardItemModel*>(%B)"> <extra-includes> <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> @@ -1775,6 +1749,18 @@ <include file-name="QPixmap" location="global"/> </extra-includes> <enum-type name="Mode"/> + <modify-function signature="setPixmap(const QPixmap&, QClipboard::Mode)"> + <modify-argument index="1" pyi-type="PySide6.QtGui.QPixmap"/> + </modify-function> + <add-function signature="setPixmap(PyPathLike@path@)"> + <inject-code file="../glue/qtgui.cpp" snippet="qclipboard-setpixmap"/> + </add-function> + <modify-function signature="setImage(const QImage&, QClipboard::Mode)"> + <modify-argument index="1" pyi-type="PySide6.QtGui.QImage"/> + </modify-function> + <add-function signature="setImage(PyPathLike@path@)"> + <inject-code file="../glue/qtgui.cpp" snippet="qclipboard-setimage"/> + </add-function> <modify-function signature="setMimeData(QMimeData*,QClipboard::Mode)" allow-thread="yes"> <modify-argument index="1"> <!-- TODO: maybe this is not the best solution --> @@ -1782,7 +1768,7 @@ </modify-argument> </modify-function> <modify-function signature="text(QString&,QClipboard::Mode)const"> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[str, PySide6.QtGui.QClipboard.Mode]"> <replace-type modified-type="(retval, subtype)"/> </modify-argument> <inject-code class="target" position="end" file="../glue/qtgui.cpp" snippet="qclipboard-text"/> @@ -1803,6 +1789,7 @@ <include file-name="QTextOption" location="global"/> </extra-includes> <enum-type name="CursorMode"/> + <enum-type name="GlyphRunRetrievalFlag" flags="GlyphRunRetrievalFlags" since="6.5"/> <value-type name="FormatRange"> <include file-name="QTextLayout" location="global"/> </value-type> @@ -1814,9 +1801,9 @@ <include file-name="QTextCursor" location="global"/> </extra-includes> <enum-type name="FindFlag" flags="FindFlags"/> - <enum-type name="MarkdownFeature" flags="MarkdownFeatures" since="5.14"/> + <enum-type name="MarkdownFeature" flags="MarkdownFeatures"/> <enum-type name="MetaInformation"/> - <enum-type name="ResourceType"/> + <enum-type name="ResourceType" python-type="IntEnum"/> <enum-type name="Stacks" since="4.7"/> <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)"> <modify-argument index="1"> @@ -1899,11 +1886,9 @@ </add-function> <!-- ### Overloads using QList<T> does the job of these methods --> <modify-function signature="drawLines(const QLine*,int)" remove="all"/> - <modify-function signature="drawLines(const QLineF*,int)" remove="all"/> <modify-function signature="drawLines(const QPoint*,int)" remove="all"/> <modify-function signature="drawLines(const QPointF*,int)" remove="all"/> <modify-function signature="drawRects(const QRect*,int)" remove="all"/> - <modify-function signature="drawRects(const QRectF*,int)" remove="all"/> <!-- ### --> <!-- PYSIDE-1540: Preferably use the QPolygon overloads first to avoid a costly sequence type check on QPolygon. --> @@ -1913,7 +1898,6 @@ <insert-template name="qpainter_drawlist"/> </inject-code> </add-function> - <modify-function signature="drawPoints(const QPointF*,int)" remove="all"/> <add-function signature="drawPoints(QList<QPointF>)" overload-number="3"> <inject-code> <insert-template name="qpainter_drawlist"/> @@ -1982,6 +1966,9 @@ <inject-code class="target" position="beginning"> <insert-template name="fix_args,QRectF*"/> </inject-code> + <inject-documentation format="target" mode="prepend"> + The function returns the bounding rectangle enclosing the whole text. + </inject-documentation> </modify-function> <modify-function signature="drawText(QRect,int,QString,QRect*)"> <modify-argument index="4"> @@ -1994,6 +1981,9 @@ <inject-code class="target" position="beginning"> <insert-template name="fix_args,QRect*"/> </inject-code> + <inject-documentation format="target" mode="prepend"> + The function returns the bounding rectangle enclosing the whole text. + </inject-documentation> </modify-function> <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)"> <modify-argument index="7"> @@ -2003,6 +1993,9 @@ <inject-code class="target" position="beginning"> <insert-template name="fix_args,QRect*"/> </inject-code> + <inject-documentation format="target" mode="prepend"> + The function returns the bounding rectangle enclosing the whole text. + </inject-documentation> </modify-function> <add-function signature="__enter__()" return-type="QPainter"> <inject-code file="../glue/qtgui.cpp" snippet="qpainter-enter"/> @@ -2310,7 +2303,7 @@ </value-type> <value-type name="QMatrix4x4" since="4.6"> - <enum-type name="Flag" flags="Flags" since="6.0"/> + <enum-type name="Flag" flags="Flags"/> <!-- Qt5: HAIRY TRICK ALERT ahead! Qt5 partially replaced 'qreal' by float. @@ -2373,7 +2366,7 @@ <remove-argument/> </modify-argument> <modify-argument index="return"> - <replace-type modified-type="PyTupleObject*"/> + <replace-type modified-type="Tuple"/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qmatrix4x4-copydatato"/> </modify-function> @@ -2382,7 +2375,7 @@ <modify-argument index="1"> <remove-argument/> </modify-argument> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="Tuple[PySide6.QtGui.QMatrix4x4, bool]"> <replace-type modified-type="PyTuple"/> </modify-argument> <inject-code class="target" position="beginning"> @@ -2422,10 +2415,27 @@ </inject-code> </add-function> - <!-- Qt5.5: XXX support the output variables! For now, I just suppressed the new methods. --> - <modify-function signature="getAxisAndAngle(float*,float*,float*,float*)const" since="5.5" remove="all"/> - <modify-function signature="getAxisAndAngle(QVector3D*,float*)const" since="5.5" remove="all"/> - <modify-function signature="getEulerAngles(float*,float*,float*)const" since="5.5" remove="all"/> + <!-- There can be only one return type. --> + <modify-function signature="getAxisAndAngle(float*,float*,float*,float*)const" remove="all"/> + <modify-function signature="getAxisAndAngle(QVector3D*,float*)const"> + <modify-argument index="return" pyi-type="Tuple[PySide6.QtGui.QVector3D, float]"> + <replace-type modified-type="(QVector3D, float)"/> + </modify-argument> + <modify-argument index="1"><remove-argument/></modify-argument> + <modify-argument index="2"><remove-argument/></modify-argument> + <inject-code class="target" position="beginning" + file="../glue/qtgui.cpp" snippet="qquaternion-getaxisandangle-vector3d-float"/> + </modify-function> + <modify-function signature="getEulerAngles(float*,float*,float*)const"> + <modify-argument index="return" pyi-type="Tuple[float, float, float]"> + <replace-type modified-type="(float, float, float)"/> + </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> + <inject-code class="target" position="beginning" + file="../glue/qtgui.cpp" snippet="qquaternion-geteulerangles"/> + </modify-function> </value-type> <object-type name="QTouchEvent" since="4.6"> @@ -2534,18 +2544,6 @@ </add-function> </value-type> - <suppress-warning text="template baseclass 'QListSpecialMethods<T>' of 'QList' is not known"/> - <suppress-warning text="template baseclass 'QGenericMatrix<float>' of '*' is not known"/> - - <!-- Qt5: note: the unnamed enum cannot be rejected by - <rejection class="QMatrix4x4" enum-name="enum_1"/> - Instead, we have to suppress the warning. Why that? - - Compare also the note at the beginning of typesystem_widgets_common.xml . - This seems to be a related problem with unnamed structures in shiboken. - --> - <suppress-warning text="enum 'QMatrix4x4::enum_1' is specified in typesystem, but not declared"/> - <object-type name="QSessionManager"> <extra-includes> </extra-includes> @@ -2553,9 +2551,6 @@ <!-- ### --> </object-type> - <!-- This enum is present on QtCore --> - <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared"/> - <!-- Qt5: here the new QWindow stuff and what it pulls in --> <object-type name="QBackingStore"/> <object-type name="QSurface"> @@ -2564,20 +2559,20 @@ </object-type> <rejection class="QSurface" field-name="m_reserved"/> <value-type name="QSurfaceFormat"> - <enum-type name="ColorSpace" since="5.10"/> + <enum-type name="ColorSpace"/> <enum-type name="FormatOption" flags="FormatOptions"/> <enum-type name="OpenGLContextProfile"/> <enum-type name="RenderableType"/> <enum-type name="SwapBehavior"/> </value-type> - <object-type name="QOffscreenSurface" since="5.1"/> + <object-type name="QOffscreenSurface"/> <primitive-type name="QPlatformSurface"> <extra-includes> <include file-name="QtGui/qpa/qplatformsurface.h" location="global"/> </extra-includes> </primitive-type> - <object-type name="QWindow" delete-in-main-thread="true"> + <object-type name="QWindow" delete-in-main-thread="true" polymorphic-base="true"> <enum-type name="AncestorMode"/> <enum-type name="Visibility"/> <modify-function signature="raise()" rename="raise_"/> @@ -2622,6 +2617,8 @@ <include file-name="QLocale" location="global"/> <include file-name="pysideqapp.h" location="global"/> <include file-name="pysidecleanup.h" location="global"/> + <!-- QOverrideCursorGuard --> + <include file-name="qtguihelper.h" location="local"/> </extra-includes> <modify-function signature="QGuiApplication(int&,char**,int)" access="private"/> <add-function signature="QGuiApplication(QStringList)"> @@ -2635,8 +2632,15 @@ <add-function signature="exec_()" return-type="int"> <inject-code file="../glue/qtgui.cpp" snippet="qguiapplication-exec"/> </add-function> + <add-function signature="nativeInterface()const" return-type="PyObject"> + <modify-argument index="return"> <!-- Suppress return value heuristics --> + <define-ownership class="target" owner="default"/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" + snippet="qguiapplication-nativeInterface"/> + </add-function> <modify-function signature="setOverrideCursor(const QCursor&)"> - <modify-argument index="return"> + <modify-argument index="return" pyi-type="PyObject"> <replace-type modified-type="QtGuiHelper::QOverrideCursorGuard*"/> </modify-argument> <inject-code class="target" position="end" file="../glue/qtgui.cpp" @@ -2644,14 +2648,46 @@ </modify-function> </object-type> + <namespace-type name="QNativeInterface" private="yes" since="6.7"> + <object-type name="QX11Application" private="yes" disable-wrapper="yes" + force-abstract="yes"> + <configuration condition="QT_CONFIG(xcb)"/> + <modify-function signature="display()const"> + <modify-argument index="return"> + <replace-type modified-type="int"/> + </modify-argument> + <inject-code class="target" position="end" file="../glue/qtgui.cpp" + snippet="qx11application-resource-ptr"/> + </modify-function> + <modify-function signature="connection()const"> + <modify-argument index="return"> + <replace-type modified-type="int"/> + </modify-argument> + <inject-code class="target" position="end" file="../glue/qtgui.cpp" + snippet="qx11application-resource-ptr"/> + </modify-function> + </object-type> + <object-type name="QWindowsScreen" private="yes" disable-wrapper="yes" + force-abstract="yes"> + <configuration condition="#ifdef Q_OS_WIN"/> + </object-type> + </namespace-type> + <object-type name="QOpenGLContext"> <enum-type name="OpenGLModuleType"/> </object-type> - <object-type name="QOpenGLContextGroup" since="5.0"/> + <object-type name="QOpenGLContextGroup"/> <!-- Compile error on Windows: QOpenGLPaintDevice::QOpenGLPaintDevice(const QOpenGLPaintDevice &)': attempting to reference a deleted function - <object-type name="QOpenGLPaintDevice" since="5.0"/> + <object-type name="QOpenGLPaintDevice"/> --> - <object-type name="QOpenGLExtraFunctions" since="5.6"> + <object-type name="QOpenGLExtraFunctions"> + <extra-includes> + <include file-name="QtCore/QVarLengthArray" location="global"/> + <include file-name="sbkcpptonumpy.h" location="global"/> + </extra-includes> + <inject-code class="native" position="beginning" file="../glue/qtgui.cpp" + snippet="qopenglextrafunctions-glgeti-v-return-size"/> + <!-- Exlusions due to compile errors --> <modify-function signature="glEndTransformFeedback()" remove="all"/> <modify-function signature="glPauseTransformFeedback()" remove="all"/> @@ -2659,184 +2695,201 @@ <modify-function signature="^glClearBuffer.*\(.*\*.*$"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glDebugMessageControl(&GLuint;,&GLuint;,&GLuint;,&GLint;,const &GLuint;*,&GLbyte;)"> + <modify-function signature="glDebugMessageControl(GLenum,GLenum,GLenum,GLsizei,const GLuint*,GLboolean)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glDeleteProgramPipelines(&GLint;,const &GLuint;*)"> + <modify-function signature="glDeleteProgramPipelines(GLsizei,const GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glDeleteQueries(&GLint;,const &GLuint;*)"> + <modify-function signature="glDeleteQueries(GLsizei,const GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glDeleteSamplers(&GLint;,const &GLuint;*)"> + <modify-function signature="glDeleteSamplers(GLsizei,const GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glDeleteTransformFeedbacks(&GLint;,const &GLuint;*)"> + <modify-function signature="glDeleteTransformFeedbacks(GLsizei,const GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glDeleteVertexArrays(&GLint;,const &GLuint;*)"> + <modify-function signature="glDeleteVertexArrays(GLsizei,const GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glDrawBuffers(&GLint;,const &GLuint;*)"> + <modify-function signature="glDrawBuffers(GLsizei,const GLenum*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glGenProgramPipelines(&GLint;,&GLuint;*)"> + <modify-function signature="glGenProgramPipelines(GLsizei,GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glGenQueries(&GLint;,&GLuint;*)"> + <modify-function signature="glGenQueries(GLsizei,GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glGenSamplers(&GLint;,&GLuint;*)"> + <modify-function signature="glGenSamplers(GLsizei,GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glGenTransformFeedbacks(&GLint;,&GLuint;*)"> + <modify-function signature="glGenTransformFeedbacks(GLsizei,GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glGenVertexArrays(&GLint;,&GLuint;*)"> + <modify-function signature="glGenVertexArrays(GLsizei,GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glGetActiveUniformBlockiv(&GLuint;,&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetActiveUniformBlockiv(GLuint,GLuint,GLenum,GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glGetActiveUniformsiv(&GLuint;,&GLint;,const &GLuint;*,&GLuint;,&GLint;*)"> + <modify-function signature="glGetActiveUniformsiv(GLuint,GLsizei,const GLuint*,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glGetFramebufferParameteriv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetFramebufferParameteriv(GLenum,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetIntegeri_v(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetBooleani_v(GLenum,GLuint,GLboolean*)"> + <modify-argument index="return" pyi-type="Union[bool,numpy.ndarray]"> + <replace-type modified-type="PyObject"/> + </modify-argument> + <modify-argument index="3"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" + snippet="qopenglextrafunctions-glgetbooleani-v"/> + </modify-function> + <!-- FIXME PYSIDE 7: Use the remove array modification and use + the version with return value instead --> + <modify-function signature="glGetIntegeri_v(GLenum,GLuint,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetInternalformativ(&GLuint;,&GLuint;,&GLuint;,&GLint;,&GLint;*)"> + <add-function signature="glGetIntegeri_v(GLuint,GLuint)" return-type="PyObject"> + <modify-argument index="return" pyi-type="Union[int,numpy.ndarray]"/> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" + snippet="qopenglextrafunctions-glgetintegeri-v"/> + </add-function> + <modify-function signature="glGetInternalformativ(GLenum,GLenum,GLenum,GLsizei,GLint*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glGetMultisamplefv(&GLuint;,&GLuint;,float*)"> + <modify-function signature="glGetMultisamplefv(GLenum,GLuint,GLfloat*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetProgramInterfaceiv(&GLuint;,&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetProgramInterfaceiv(GLuint,GLenum,GLenum,GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glGetProgramPipelineiv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetProgramPipelineiv(GLuint,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetProgramResourceiv(&GLuint;,&GLuint;,&GLuint;,&GLint;,const &GLuint;*,&GLint;,&GLint;*,&GLint;*)"> + <modify-function signature="glGetProgramResourceiv(GLuint,GLenum,GLuint,GLsizei,const GLenum*,GLsizei,GLsizei*,GLint*)"> <modify-argument index="5"><array/></modify-argument> <modify-argument index="7"><array/></modify-argument> <modify-argument index="8"><array/></modify-argument> </modify-function> - <modify-function signature="glGetQueryObjectuiv(&GLuint;,&GLuint;,&GLuint;*)"> + <modify-function signature="glGetQueryObjectuiv(GLuint,GLenum,GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetQueryiv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetQueryiv(GLenum,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetSamplerParameterfv(&GLuint;,&GLuint;,float*)"> + <modify-function signature="glGetSamplerParameterfv(GLuint,GLenum,GLfloat*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetSamplerParameteriv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetSamplerParameteriv(GLuint,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetSamplerParameterIiv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetSamplerParameterIiv(GLuint,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetSamplerParameterIuiv(&GLuint;,&GLuint;,&GLuint;*)"> + <modify-function signature="glGetSamplerParameterIuiv(GLuint,GLenum,GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetTexLevelParameteriv(&GLuint;,&GLint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetTexLevelParameteriv(GLenum,GLint,GLenum,GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glGetTexLevelParameterfv(&GLuint;,&GLint;,&GLuint;,float*)"> + <modify-function signature="glGetTexLevelParameterfv(GLenum,GLint,GLenum,GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glGetTexParameterIiv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetTexParameterIiv(GLenum,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetTexParameterIuiv(&GLuint;,&GLuint;,&GLuint;*)"> + <modify-function signature="glGetTexParameterIuiv(GLenum,GLenum,GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetnUniformiv(&GLuint;,&GLint;,&GLint;,&GLint;*)"> + <modify-function signature="glGetnUniformiv(GLuint,GLint,GLsizei,GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glGetnUniformuiv(&GLuint;,&GLint;,&GLint;,&GLuint;*)"> + <modify-function signature="glGetnUniformuiv(GLuint,GLint,GLsizei,GLuint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glGetUniformuiv(&GLuint;,&GLint;,&GLuint;*)"> + <modify-function signature="glGetUniformuiv(GLuint,GLint,GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetVertexAttribIiv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetVertexAttribIiv(GLuint,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetVertexAttribIuiv(&GLuint;,&GLuint;,&GLuint;*)"> + <modify-function signature="glGetVertexAttribIuiv(GLuint,GLenum,GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glInvalidateFramebuffer(&GLuint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glInvalidateFramebuffer(GLenum,GLsizei,const GLenum*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glInvalidateSubFramebuffer(&GLuint;,&GLint;,const &GLuint;*,&GLint;,&GLint;,&GLint;,&GLint;)"> + <modify-function signature="glInvalidateSubFramebuffer(GLenum,GLsizei,const GLenum*,GLint,GLint,GLsizei,GLsizei)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform1fv(&GLuint;,&GLint;,&GLint;,const float*)"> + <modify-function signature="glProgramUniform1fv(GLuint,GLint,GLsizei,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform1iv(&GLuint;,&GLint;,&GLint;,const &GLint;*)"> + <modify-function signature="glProgramUniform1iv(GLuint,GLint,GLsizei,const GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform1uiv(&GLuint;,&GLint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glProgramUniform1uiv(GLuint,GLint,GLsizei,const GLuint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform2fv(&GLuint;,&GLint;,&GLint;,const float*)"> + <modify-function signature="glProgramUniform2fv(GLuint,GLint,GLsizei,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform2iv(&GLuint;,&GLint;,&GLint;,const &GLint;*)"> + <modify-function signature="glProgramUniform2iv(GLuint,GLint,GLsizei,const GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform2uiv(&GLuint;,&GLint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glProgramUniform2uiv(GLuint,GLint,GLsizei,const GLuint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform3fv(&GLuint;,&GLint;,&GLint;,const float*)"> + <modify-function signature="glProgramUniform3fv(GLuint,GLint,GLsizei,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform3iv(&GLuint;,&GLint;,&GLint;,const &GLint;*)"> + <modify-function signature="glProgramUniform3iv(GLuint,GLint,GLsizei,const GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform3uiv(&GLuint;,&GLint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glProgramUniform3uiv(GLuint,GLint,GLsizei,const GLuint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform4fv(&GLuint;,&GLint;,&GLint;,const float*)"> + <modify-function signature="glProgramUniform4fv(GLuint,GLint,GLsizei,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform4iv(&GLuint;,&GLint;,&GLint;,const &GLint;*)"> + <modify-function signature="glProgramUniform4iv(GLuint,GLint,GLsizei,const GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniform4uiv(&GLuint;,&GLint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glProgramUniform4uiv(GLuint,GLint,GLsizei,const GLuint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix2fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix2fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix2x3fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix2x3fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix2x4fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix2x4fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix3fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix3fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix3x2fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix3x2fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix3x4fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix3x4fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix4fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix4fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix4x2fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix4x2fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> - <modify-function signature="glProgramUniformMatrix4x3fv(&GLuint;,&GLint;,&GLint;,&GLbyte;,const float*)"> + <modify-function signature="glProgramUniformMatrix4x3fv(GLuint,GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="5"><array/></modify-argument> </modify-function> <modify-function signature="^glSamplerParameterI?u?[fi]v\(.*$"> @@ -2845,43 +2898,43 @@ <modify-function signature="^glTexParameterI?u?[fi]v\(.*$"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glUniform1uiv(&GLint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glUniform1uiv(GLint,GLsizei,const GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glUniform2uiv(&GLint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glUniform2uiv(GLint,GLsizei,const GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glUniform3uiv(&GLint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glUniform3uiv(GLint,GLsizei,const GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glUniform4uiv(&GLint;,&GLint;,const &GLuint;*)"> + <modify-function signature="glUniform4uiv(GLint,GLsizei,const GLuint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glUniformMatrix2x3fv(&GLint;,&GLsizei;,&GLboolean;,const float*)"> + <modify-function signature="glUniformMatrix2x3fv(GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glUniformMatrix2x4fv(&GLint;,&GLsizei;,&GLboolean;,const float*)"> + <modify-function signature="glUniformMatrix2x4fv(GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glUniformMatrix3x2fv(&GLint;,&GLsizei;,&GLboolean;,const float*)"> + <modify-function signature="glUniformMatrix3x2fv(GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glUniformMatrix3x4fv(&GLint;,&GLsizei;,&GLboolean;,const float*)"> + <modify-function signature="glUniformMatrix3x4fv(GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glUniformMatrix4x2fv(&GLint;,&GLsizei;,&GLboolean;,const float*)"> + <modify-function signature="glUniformMatrix4x2fv(GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glUniformMatrix4x3fv(&GLint;,&GLsizei;,&GLboolean;,const float*)"> + <modify-function signature="glUniformMatrix4x3fv(GLint,GLsizei,GLboolean,const GLfloat*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glVertexAttribI4iv(&GLuint;,const &GLint;*)"> + <modify-function signature="glVertexAttribI4iv(GLuint,const GLint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glVertexAttribI4uiv(&GLuint;,const &GLuint;*)"> + <modify-function signature="glVertexAttribI4uiv(GLuint,const GLuint*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glGetStringi(&GLuint;,&GLuint;)"> + <modify-function signature="glGetStringi(GLenum,GLuint)"> <modify-argument index="return"> <replace-type modified-type="QString"/> </modify-argument> @@ -2889,42 +2942,73 @@ snippet="glgetstring-return"/> </modify-function> </object-type> - <object-type name="QOpenGLFunctions" since="5.0"> + <object-type name="QOpenGLFunctions"> + <extra-includes> + <include file-name="QtCore/QVarLengthArray" location="global"/> + <include file-name="sbkcpptonumpy.h" location="global"/> + </extra-includes> + <inject-code class="native" position="beginning" file="../glue/qtgui.cpp" + snippet="qopenglfunctions-glgetv-return-size"/> + <enum-type name="OpenGLFeature" flags="OpenGLFeatures"/> - <add-function signature="glGetShaderSource(&GLuint; @shader@)" return-type="const char *"> + <add-function signature="glGetShaderSource(GLuint @shader@)" return-type="const char *"> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="glgetshadersource"/> </add-function> - <add-function signature="glShaderSource(&GLuint; @shader@,const QString & @source@)"> + <add-function signature="glShaderSource(GLuint @shader@,const QString & @source@)"> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="glshadersource"/> </add-function> - <modify-function signature="glGetAttachedShaders(&GLuint;,&GLint;,&GLint;*,&GLuint;*)"> + <modify-function signature="glGetAttachedShaders(GLuint,GLsizei,GLsizei*,GLuint*)"> <modify-argument index="3"><array/></modify-argument> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glGetBufferParameteriv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetBufferParameteriv(GLenum,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetFloatv(&GLuint;,float*)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="glGetFramebufferAttachmentParameteriv(&GLuint;,&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetFramebufferAttachmentParameteriv(GLenum,GLenum,GLenum,GLint*)"> <modify-argument index="4"><array/></modify-argument> </modify-function> - <modify-function signature="glGetIntegerv(&GLuint;,&GLint;*)"> + <modify-function signature="glGetBooleanv(GLenum,GLboolean*)"> + <modify-argument index="return" pyi-type="Union[bool,numpy.ndarray]"> + <replace-type modified-type="PyObject"/> + </modify-argument> + <modify-argument index="2"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" + snippet="qopenglfunctions-glgetbooleanv"/> + </modify-function> + <!-- FIXME PYSIDE 7: Use the remove array modification and use + the version with return value instead --> + <modify-function signature="glGetFloatv(GLenum,GLfloat*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glGetProgramiv(&GLuint;,&GLuint;,&GLint;*)"> + <add-function signature="glGetFloatv(GLuint)" return-type="PyObject"> + <modify-argument index="return" pyi-type="Union[float,numpy.ndarray]"/> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" + snippet="qopenglfunctions-glgetfloatv"/> + </add-function> + <!-- FIXME PYSIDE 7: Use the remove array modification and use + the version with return value instead --> + <modify-function signature="glGetIntegerv(GLenum,GLint*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <add-function signature="glGetIntegerv(GLuint)" return-type="PyObject"> + <modify-argument index="return" pyi-type="Union[int,numpy.ndarray]"/> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" + snippet="qopenglfunctions-glgetintegerv"/> + </add-function> + <modify-function signature="glGetProgramiv(GLuint,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetRenderbufferParameteriv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetRenderbufferParameteriv(GLenum,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetShaderiv(&GLuint;,&GLuint;,&GLint;*)"> + <modify-function signature="glGetShaderiv(GLuint,GLenum,GLint*)"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetShaderPrecisionFormat(&GLuint;,&GLuint;,&GLint;*,&GLint;*)"> + <modify-function signature="glGetShaderPrecisionFormat(GLenum,GLenum,GLint*,GLint*)"> <modify-argument index="3"><array/></modify-argument> <modify-argument index="4"><array/></modify-argument> </modify-function> @@ -2949,7 +3033,7 @@ <modify-function signature="^glGetVertexAttrib[fi]v\(.*$"> <modify-argument index="3"><array/></modify-argument> </modify-function> - <modify-function signature="glGetString(&GLuint;)"> + <modify-function signature="glGetString(GLenum)"> <modify-argument index="return"> <replace-type modified-type="QString"/> </modify-argument> @@ -2957,38 +3041,38 @@ <insert-template name="glGetString_return_QString"/> </inject-code> </modify-function> - <modify-function signature="glShaderBinary(&GLint;,const &GLuint;*,&GLuint;,const void *,&GLint;)"> + <modify-function signature="glShaderBinary(GLint,const GLuint*,GLenum,const void*,GLint)"> <modify-argument index="2"><array/></modify-argument> </modify-function> </object-type> <!-- Classes are result of a macro expansion in src/gui/opengl/qopenglversionfunctions.h - <object-type name="QOpenGLFunctions_1_0" since="5.1"/> - <object-type name="QOpenGLFunctions_1_1" since="5.1"/> - <object-type name="QOpenGLFunctions_1_2" since="5.1"/> - <object-type name="QOpenGLFunctions_1_3" since="5.1"/> - <object-type name="QOpenGLFunctions_1_4" since="5.1"/> - <object-type name="QOpenGLFunctions_1_5" since="5.1"/> - <object-type name="QOpenGLFunctions_2_0" since="5.1"> - <object-type name="QOpenGLFunctions_2_1" since="5.1"/> - <object-type name="QOpenGLFunctions_3_0" since="5.1"/> - <object-type name="QOpenGLFunctions_3_1" since="5.1"/> - <object-type name="QOpenGLFunctions_3_2_Compatibility" since="5.1"/> - <object-type name="QOpenGLFunctions_3_2_Core" since="5.1"/> - <object-type name="QOpenGLFunctions_3_3_Compatibility" since="5.1"/> - <object-type name="QOpenGLFunctions_3_3_Core" since="5.1"/> - <object-type name="QOpenGLFunctions_4_0_Compatibility" since="5.1"/> - <object-type name="QOpenGLFunctions_4_0_Core" since="5.1"/> - <object-type name="QOpenGLFunctions_4_1_Compatibility" since="5.1"/> - <object-type name="QOpenGLFunctions_4_1_Core" since="5.1"/> - <object-type name="QOpenGLFunctions_4_2_Compatibility" since="5.1"/> - <object-type name="QOpenGLFunctions_4_2_Core" since="5.1"/> - <object-type name="QOpenGLFunctions_4_3_Compatibility" since="5.1"/> - <object-type name="QOpenGLFunctions_4_3_Core" since="5.1"/> + <object-type name="QOpenGLFunctions_1_0"/> + <object-type name="QOpenGLFunctions_1_1"/> + <object-type name="QOpenGLFunctions_1_2"/> + <object-type name="QOpenGLFunctions_1_3"/> + <object-type name="QOpenGLFunctions_1_4"/> + <object-type name="QOpenGLFunctions_1_5"/> + <object-type name="QOpenGLFunctions_2_0"> + <object-type name="QOpenGLFunctions_2_1"/> + <object-type name="QOpenGLFunctions_3_0"/> + <object-type name="QOpenGLFunctions_3_1"/> + <object-type name="QOpenGLFunctions_3_2_Compatibility"/> + <object-type name="QOpenGLFunctions_3_2_Core"/> + <object-type name="QOpenGLFunctions_3_3_Compatibility"/> + <object-type name="QOpenGLFunctions_3_3_Core"/> + <object-type name="QOpenGLFunctions_4_0_Compatibility"/> + <object-type name="QOpenGLFunctions_4_0_Core"/> + <object-type name="QOpenGLFunctions_4_1_Compatibility"/> + <object-type name="QOpenGLFunctions_4_1_Core"/> + <object-type name="QOpenGLFunctions_4_2_Compatibility"/> + <object-type name="QOpenGLFunctions_4_2_Core"/> + <object-type name="QOpenGLFunctions_4_3_Compatibility"/> + <object-type name="QOpenGLFunctions_4_3_Core"/> <object-type name="QOpenGLFunctions_4_4_Compatibility" since="5.5/> - <object-type name="QOpenGLFunctions_4_4_Core" since="5.5"/> - <object-type name="QOpenGLFunctions_4_5_Compatibility since="5.5""/> - <object-type name="QOpenGLFunctions_4_5_Core" since="5.5"/> - <object-type name="QOpenGLFunctions_ES2" since="5.1"/> + <object-type name="QOpenGLFunctions_4_4_Core"/> + <object-type name="QOpenGLFunctions_4_5_Compatibility/> + <object-type name="QOpenGLFunctions_4_5_Core"/> + <object-type name="QOpenGLFunctions_ES2"/> --> <value-type name="QPageLayout"> <enum-type name="Mode"/> @@ -3014,7 +3098,7 @@ <enum-type name="YUVLayout"/> </value-type> <object-type name="QPdfWriter"/> - <object-type name="QPointingDevice" since="6.0"> + <object-type name="QPointingDevice"> <enum-type name="PointerType" flags="PointerTypes"/> <enum-type name="GrabTransition"/> </object-type> @@ -3036,6 +3120,13 @@ </modify-argument> <inject-code file="../glue/qtgui.cpp" snippet="qscreen-grabWindow"/> </modify-function> + <add-function signature="nativeInterface()const" return-type="PyObject"> + <modify-argument index="return"> <!-- Suppress return value heuristics --> + <define-ownership class="target" owner="default"/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" + snippet="qscreen-nativeInterface"/> + </add-function> </object-type> <object-type name="QStyleHints"/> @@ -3076,7 +3167,7 @@ <namespace-type name="QtGuiHelper" visible="no"> <object-type name="QOverrideCursorGuard" copyable="no"> - <add-function signature="__enter__()" return-type="QOverrideCursorGuard"> + <add-function signature="__enter__()" return-type="QtGuiHelper::QOverrideCursorGuard"> <inject-code file="../glue/qtcore.cpp" snippet="default-enter"/> </add-function> <add-function signature="__exit__(PyObject*,PyObject*,PyObject*)"> @@ -3085,4 +3176,6 @@ </object-type> </namespace-type> + <opaque-container name="QList" opaque-containers="QVector2D:QVector2DList;QVector3D:QVector3DList;QVector4D:QVector4DList"/> + </typesystem> |