diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-01 16:18:23 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-03 09:56:16 +0200 |
| commit | 243aa7128cffd957f088ed66d5056211b64d7771 (patch) | |
| tree | ef9b5706074104a01280993790485ec9b13492e5 /sources/pyside6 | |
| parent | d4b69c62733fb13f21c353163cbbb5caf3dd4bd7 (diff) | |
PySide6: Add some missing classes from qtbase
[ChangeLog][PySide6] A number of missing classes from the qtbase
repository have been added.
Pick-to: 6.1
Task-number: PYSIDE-1482
Change-Id: I7b5388df1a4773ccdf32d44e2d968ba814453e34
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6')
10 files changed, 61 insertions, 3 deletions
diff --git a/sources/pyside6/PySide6/QtCore/CMakeLists.txt b/sources/pyside6/PySide6/QtCore/CMakeLists.txt index 064e0688d..a6d523e89 100644 --- a/sources/pyside6/PySide6/QtCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtCore/CMakeLists.txt @@ -77,6 +77,7 @@ ${QtCore_GEN_DIR}/qjsondocument_wrapper.cpp ${QtCore_GEN_DIR}/qjsonparseerror_wrapper.cpp ${QtCore_GEN_DIR}/qjsonvalue_wrapper.cpp ${QtCore_GEN_DIR}/qkeycombination_wrapper.cpp +${QtCore_GEN_DIR}/qlibrary_wrapper.cpp ${QtCore_GEN_DIR}/qlibraryinfo_wrapper.cpp ${QtCore_GEN_DIR}/qline_wrapper.cpp ${QtCore_GEN_DIR}/qlinef_wrapper.cpp @@ -97,6 +98,7 @@ ${QtCore_GEN_DIR}/qmimedata_wrapper.cpp ${QtCore_GEN_DIR}/qmimedatabase_wrapper.cpp ${QtCore_GEN_DIR}/qmimetype_wrapper.cpp ${QtCore_GEN_DIR}/qmodelindex_wrapper.cpp +${QtCore_GEN_DIR}/qmodelroledata_wrapper.cpp ${QtCore_GEN_DIR}/qmutex_wrapper.cpp ${QtCore_GEN_DIR}/qobject_wrapper.cpp ${QtCore_GEN_DIR}/qoperatingsystemversion_wrapper.cpp @@ -135,6 +137,11 @@ ${QtCore_GEN_DIR}/qsocketnotifier_wrapper.cpp ${QtCore_GEN_DIR}/qsortfilterproxymodel_wrapper.cpp ${QtCore_GEN_DIR}/qstandardpaths_wrapper.cpp ${QtCore_GEN_DIR}/qstorageinfo_wrapper.cpp +${QtCore_GEN_DIR}/qstringconverterbase_wrapper.cpp +${QtCore_GEN_DIR}/qstringconverterbase_state_wrapper.cpp +${QtCore_GEN_DIR}/qstringconverter_wrapper.cpp +${QtCore_GEN_DIR}/qstringencoder_wrapper.cpp +${QtCore_GEN_DIR}/qstringdecoder_wrapper.cpp ${QtCore_GEN_DIR}/qstringlistmodel_wrapper.cpp ${QtCore_GEN_DIR}/qsysinfo_wrapper.cpp ${QtCore_GEN_DIR}/qsystemsemaphore_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 39a4091d4..fcf17cc25 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -1472,6 +1472,8 @@ <modify-function signature="exit(int)" allow-thread="yes"/> </object-type> + <value-type name="QModelRoleData"/> + <object-type name="QAbstractItemModel"> <enum-type name="CheckIndexOption" flags="CheckIndexOptions" since="5.11"/> <enum-type name="LayoutChangeHint"/> @@ -2201,6 +2203,9 @@ <value-type name="QOperatingSystemVersion" since="5.9"> <enum-type name="OSType"/> </value-type> + <object-type name="QLibrary"> + <enum-type name="LoadHint" flags="LoadHints"/> + </object-type> <object-type name="QLibraryInfo"> <enum-type name="LibraryPath"/> <modify-function signature="build()"> @@ -3006,6 +3011,18 @@ <object-type name="QPluginLoader"/> <object-type name="QStringListModel"/> + <object-type name="QStringConverterBase"> + <enum-type name="Flag" flags="Flags"/> + <object-type name="State"/> + </object-type> + <object-type name="QStringConverter"> + <enum-type name="Encoding"/> + </object-type> + <object-type name="QStringEncoder"> + <modify-function signature="appendToBuffer(char*,QStringView)" remove="all"/> + </object-type> + <object-type name="QStringDecoder"/> + <object-type name="QSysInfo"> <enum-type name="Endian"/> <enum-type name="Sizes"/> diff --git a/sources/pyside6/PySide6/QtGui/CMakeLists.txt b/sources/pyside6/PySide6/QtGui/CMakeLists.txt index 43f136abf..5b5379089 100644 --- a/sources/pyside6/PySide6/QtGui/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtGui/CMakeLists.txt @@ -36,6 +36,7 @@ ${QtGui_GEN_DIR}/qcolor_wrapper.cpp ${QtGui_GEN_DIR}/qcolorspace_wrapper.cpp ${QtGui_GEN_DIR}/qcolorconstants_wrapper.cpp ${QtGui_GEN_DIR}/qcolorconstants_svg_wrapper.cpp +${QtGui_GEN_DIR}/qcolortransform_wrapper.cpp ${QtGui_GEN_DIR}/qconicalgradient_wrapper.cpp ${QtGui_GEN_DIR}/qcontextmenuevent_wrapper.cpp ${QtGui_GEN_DIR}/qcursor_wrapper.cpp @@ -56,6 +57,7 @@ ${QtGui_GEN_DIR}/qfontdatabase_wrapper.cpp ${QtGui_GEN_DIR}/qfontinfo_wrapper.cpp ${QtGui_GEN_DIR}/qfontmetrics_wrapper.cpp ${QtGui_GEN_DIR}/qfontmetricsf_wrapper.cpp +${QtGui_GEN_DIR}/qglyphrun_wrapper.cpp ${QtGui_GEN_DIR}/qgradient_wrapper.cpp ${QtGui_GEN_DIR}/qguiapplication_wrapper.cpp ${QtGui_GEN_DIR}/qhelpevent_wrapper.cpp @@ -98,6 +100,8 @@ ${QtGui_GEN_DIR}/qopenglextrafunctions_wrapper.cpp ${QtGui_GEN_DIR}/qopenglfunctions_wrapper.cpp ${QtGui_GEN_DIR}/qpagedpaintdevice_wrapper.cpp ${QtGui_GEN_DIR}/qpagelayout_wrapper.cpp +${QtGui_GEN_DIR}/qpageranges_wrapper.cpp +${QtGui_GEN_DIR}/qpageranges_range_wrapper.cpp ${QtGui_GEN_DIR}/qpagesize_wrapper.cpp ${QtGui_GEN_DIR}/qpaintdevice_wrapper.cpp ${QtGui_GEN_DIR}/qpaintdevicewindow_wrapper.cpp @@ -117,6 +121,7 @@ ${QtGui_GEN_DIR}/qpixmap_wrapper.cpp ${QtGui_GEN_DIR}/qpixmapcache_key_wrapper.cpp ${QtGui_GEN_DIR}/qpixmapcache_wrapper.cpp ${QtGui_GEN_DIR}/qpixelformat_wrapper.cpp +${QtGui_GEN_DIR}/qplatformsurfaceevent_wrapper.cpp ${QtGui_GEN_DIR}/qpointerevent_wrapper.cpp ${QtGui_GEN_DIR}/qpointingdevice_wrapper.cpp ${QtGui_GEN_DIR}/qpointingdeviceuniqueid_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index ab026baf5..c54a7e5d7 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -286,6 +286,10 @@ <include file-name="QtGui/qtransform.h" location="global"/> </value-type> + <value-type name="QGlyphRun"> + <enum-type name="GlyphRunFlag" flags="GlyphRunFlags"/> + </value-type> + <value-type name="QStaticText"> <enum-type name="PerformanceHint"/> </value-type> @@ -1038,6 +1042,8 @@ <enum-type name="TransferFunction"/> </value-type> + <value-type name="QColorTransform"/> + <value-type name="QFontMetricsF" > <modify-function signature="boundingRect(QChar)const" rename="boundingRectChar"> @@ -1369,6 +1375,10 @@ <object-type name="QMoveEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Move"/> <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"> + <enum-type name="SurfaceEventType"/> + </object-type> <object-type name="QResizeEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Resize"/> <object-type name="QShortcutEvent" copyable = "false" polymorphic-id-expression="%1->type() == QEvent::Shortcut"> </object-type> @@ -2854,6 +2864,9 @@ <enum-type name="Orientation"/> <enum-type name="Unit"/> </value-type> + <value-type name="QPageRanges"> + <value-type name="Range"/> + </value-type> <value-type name="QPageSize"> <enum-type name="PageSizeId"/> <enum-type name="Unit"/> diff --git a/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt b/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt index 0301cc0b0..830cce93f 100644 --- a/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt @@ -17,6 +17,7 @@ ${QtNetwork_GEN_DIR}/qhostinfo_wrapper.cpp ${QtNetwork_GEN_DIR}/qhstspolicy_wrapper.cpp ${QtNetwork_GEN_DIR}/qhttpmultipart_wrapper.cpp ${QtNetwork_GEN_DIR}/qhttppart_wrapper.cpp +${QtNetwork_GEN_DIR}/qhttp2configuration_wrapper.cpp ${QtNetwork_GEN_DIR}/qipv6address_wrapper.cpp ${QtNetwork_GEN_DIR}/qlocalserver_wrapper.cpp ${QtNetwork_GEN_DIR}/qlocalsocket_wrapper.cpp @@ -27,6 +28,7 @@ ${QtNetwork_GEN_DIR}/qnetworkcookie_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkcookiejar_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkdatagram_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkdiskcache_wrapper.cpp +${QtNetwork_GEN_DIR}/qnetworkinformation_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkinterface_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkproxy_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkproxyfactory_wrapper.cpp @@ -37,6 +39,7 @@ ${QtNetwork_GEN_DIR}/qpassworddigestor_wrapper.cpp ${QtNetwork_GEN_DIR}/qssl_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslcertificate_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslcertificateextension_wrapper.cpp +${QtNetwork_GEN_DIR}/qsslellipticcurve_wrapper.cpp ${QtNetwork_GEN_DIR}/qtcpserver_wrapper.cpp ${QtNetwork_GEN_DIR}/qtcpsocket_wrapper.cpp ${QtNetwork_GEN_DIR}/qudpsocket_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml index 3c44e4fec..4235bf7cc 100644 --- a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml +++ b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml @@ -109,6 +109,8 @@ <enum-type name="ContentType"/> </object-type> <value-type name="QHttpPart" since="5.9"/> + <value-type name="QHttp2Configuration"/> + <object-type name="QTcpServer"> <modify-function signature="waitForNewConnection(int,bool*)" allow-thread="yes"> <!-- FIXME removing default expression means user will always have to pass a value, but he wouldn't have to --> @@ -197,6 +199,11 @@ </modify-argument> </modify-function> </object-type> + <object-type name="QNetworkInformation"> + <enum-type name="Reachability"/> + <enum-type name="Feature" flags="Features"/> + <enum-type name="TriState" since="6.2"/> + </object-type> <object-type name="QNetworkCookieJar"/> <value-type name="QNetworkDatagram" since="5.8"/> <object-type name="QNetworkReply"> @@ -291,9 +298,7 @@ <enum-type name="Error"/> </value-type> - <!-- Problems with operator==(QSslEllipticCurve,QSslEllipticCurve) - <object-type name="QSslEllipticCurve"/> - --> + <value-type name="QSslEllipticCurve"/> <value-type name="QSslError"> <enum-type name="SslError"/> diff --git a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt index ee699661c..6e80a4e16 100644 --- a/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtOpenGL/CMakeLists.txt @@ -7,6 +7,7 @@ ${QtOpenGL_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp ${QtOpenGL_GEN_DIR}/qopengldebuglogger_wrapper.cpp ${QtOpenGL_GEN_DIR}/qopengldebugmessage_wrapper.cpp ${QtOpenGL_GEN_DIR}/qopenglframebufferobjectformat_wrapper.cpp +${QtOpenGL_GEN_DIR}/qopenglpaintdevice_wrapper.cpp ${QtOpenGL_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp ${QtOpenGL_GEN_DIR}/qopenglshaderprogram_wrapper.cpp ${QtOpenGL_GEN_DIR}/qopengltexture_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml index a2bfd0192..2d4fc1dd6 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml @@ -433,6 +433,7 @@ <object-type name="QOpenGLShader" since="5.0"> <enum-type name="ShaderTypeBit" flags="ShaderType"/> </object-type> + <object-type name="QOpenGLPaintDevice"/> <object-type name="QOpenGLShaderProgram" since="5.0"> <modify-function signature="setAttributeArray(int,const float*,int,int)"> <modify-argument index="2"><array/></modify-argument> diff --git a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt index fc1f9c12a..3f960bcff 100644 --- a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt @@ -144,6 +144,7 @@ ${QtWidgets_GEN_DIR}/qstyleoptionframe_wrapper.cpp ${QtWidgets_GEN_DIR}/qstyleoptiongraphicsitem_wrapper.cpp ${QtWidgets_GEN_DIR}/qstyleoptiongroupbox_wrapper.cpp ${QtWidgets_GEN_DIR}/qstyleoptionheader_wrapper.cpp +${QtWidgets_GEN_DIR}/qstyleoptionheaderv2_wrapper.cpp ${QtWidgets_GEN_DIR}/qstyleoptionmenuitem_wrapper.cpp ${QtWidgets_GEN_DIR}/qstyleoptionprogressbar_wrapper.cpp ${QtWidgets_GEN_DIR}/qstyleoptionrubberband_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml index 4f1ee2472..449ae0c51 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml @@ -125,6 +125,10 @@ <enum-type name="StyleOptionType"/> <enum-type name="StyleOptionVersion"/> </object-type> + <object-type name="QStyleOptionHeaderV2"> + <enum-type name="StyleOptionType"/> + <enum-type name="StyleOptionVersion"/> + </object-type> <object-type name="QStyleOptionMenuItem" polymorphic-id-expression="%1->type == QStyleOptionMenuItem::Type && %1->version == QStyleOptionMenuItem::Version"> <enum-type name="CheckType"/> <enum-type name="MenuItemType"/> @@ -2825,6 +2829,7 @@ </object-type> <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="Option" flags="Options" since="5.14"/> |