diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-04-19 16:03:32 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-04-22 16:33:58 +0200 |
commit | 0ad3b1fd87257ec286ecb8950f13bae19aa9ac22 (patch) | |
tree | 1c189aab272eb753937418096e453a73e41af1a3 | |
parent | 432c4b10bf77e8290b95d8ce2e01db0d80a4445a (diff) |
Add some missing classes
Identified by the script added by
1251a23cfd13bb0652f38ef3b36087034f552d57.
[ChangeLog][PySide6] A number of missing classes have been added.
Task-number: PYSIDE-487
Pick-to: 6.7
Change-Id: Ia62aab2578d46f00540856557474bc394669613f
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
29 files changed, 125 insertions, 5 deletions
diff --git a/sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt b/sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt index 45a6792cf..d9169924e 100644 --- a/sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt +++ b/sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt @@ -19,6 +19,7 @@ ${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationcliploader_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationcontroller_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationgroup_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qblendedclipanimator_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qcallbackmapping_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qchannel_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qchannelcomponent_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qchannelmapper_wrapper.cpp diff --git a/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml b/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml index 1e8c56b86..61af82d6d 100644 --- a/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml +++ b/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml @@ -37,6 +37,7 @@ <object-type name="QBlendedClipAnimator"/> <value-type name="QChannel"/> <value-type name="QChannelComponent"/> + <object-type name="QCallbackMapping"/> <object-type name="QChannelMapper" since="6.1"/> <object-type name="QChannelMapping"/> <object-type name="QClipAnimator"/> diff --git a/sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt b/sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt index 5493c6876..cd2699f11 100644 --- a/sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt @@ -19,6 +19,7 @@ ${Qt3DCore_GEN_DIR}/qt3dcore_qbackendnodemapper_wrapper.cpp ${Qt3DCore_GEN_DIR}/qt3dcore_qboundingvolume_wrapper.cpp ${Qt3DCore_GEN_DIR}/qt3dcore_qbuffer_wrapper.cpp ${Qt3DCore_GEN_DIR}/qt3dcore_qcomponent_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qcoreaspect_wrapper.cpp ${Qt3DCore_GEN_DIR}/qt3dcore_qcoresettings_wrapper.cpp ${Qt3DCore_GEN_DIR}/qt3dcore_qentity_wrapper.cpp ${Qt3DCore_GEN_DIR}/qt3dcore_qgeometry_wrapper.cpp diff --git a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml index e9532fac9..985c459b6 100644 --- a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml +++ b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml @@ -50,6 +50,7 @@ </modify-argument> </modify-function> </object-type> + <object-type name="QCoreAspect"/> <object-type name="QCoreSettings"/> <object-type name="QGeometry"/> <object-type name="QGeometryView"> diff --git a/sources/pyside6/PySide6/Qt3DRender/CMakeLists.txt b/sources/pyside6/PySide6/Qt3DRender/CMakeLists.txt index f5be5804b..72f859305 100644 --- a/sources/pyside6/PySide6/Qt3DRender/CMakeLists.txt +++ b/sources/pyside6/PySide6/Qt3DRender/CMakeLists.txt @@ -28,6 +28,7 @@ ${Qt3DRender_GEN_DIR}/qt3drender_qclipplane_wrapper.cpp ${Qt3DRender_GEN_DIR}/qt3drender_qcolormask_wrapper.cpp ${Qt3DRender_GEN_DIR}/qt3drender_qcomputecommand_wrapper.cpp ${Qt3DRender_GEN_DIR}/qt3drender_qcullface_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qdebugoverlay_wrapper.cpp ${Qt3DRender_GEN_DIR}/qt3drender_qdepthrange_wrapper.cpp ${Qt3DRender_GEN_DIR}/qt3drender_qdepthtest_wrapper.cpp ${Qt3DRender_GEN_DIR}/qt3drender_qdirectionallight_wrapper.cpp diff --git a/sources/pyside6/PySide6/Qt3DRender/typesystem_3drender.xml b/sources/pyside6/PySide6/Qt3DRender/typesystem_3drender.xml index 6a49d1373..66fd70927 100644 --- a/sources/pyside6/PySide6/Qt3DRender/typesystem_3drender.xml +++ b/sources/pyside6/PySide6/Qt3DRender/typesystem_3drender.xml @@ -68,6 +68,7 @@ <object-type name="QCullFace"> <enum-type name="CullingMode"/> </object-type> + <object-type name="QDebugOverlay"/> <object-type name="QDepthRange"/> <object-type name="QDepthTest"> <enum-type name="DepthFunction"/> diff --git a/sources/pyside6/PySide6/QtHelp/CMakeLists.txt b/sources/pyside6/PySide6/QtHelp/CMakeLists.txt index 85bda0c10..7bf46dcef 100644 --- a/sources/pyside6/PySide6/QtHelp/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtHelp/CMakeLists.txt @@ -8,6 +8,7 @@ ${QtHelp_GEN_DIR}/qcompressedhelpinfo_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpcontentitem_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpcontentmodel_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpcontentwidget_wrapper.cpp +${QtHelp_GEN_DIR}/qhelpglobal_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpengine_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpenginecore_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpfilterdata_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtHelp/typesystem_help.xml b/sources/pyside6/PySide6/QtHelp/typesystem_help.xml index cb55baca0..5fa30e034 100644 --- a/sources/pyside6/PySide6/QtHelp/typesystem_help.xml +++ b/sources/pyside6/PySide6/QtHelp/typesystem_help.xml @@ -18,6 +18,7 @@ </value-type> <object-type name="QHelpContentModel" polymorphic-id-expression="qobject_cast<QHelpContentModel*>(%B)"/> <object-type name="QHelpContentWidget"/> + <value-type name="QHelpGlobal"/> <object-type name="QHelpEngine"/> <object-type name="QHelpEngineCore"/> <value-type name="QHelpFilterData"/> diff --git a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt index 57ebdbb40..e40c5a2ed 100644 --- a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt @@ -31,8 +31,10 @@ ${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp ${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp ${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp +${QtMultimedia_GEN_DIR}/qvideoframe_paintoptions_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideosink_wrapper.cpp +${QtMultimedia_GEN_DIR}/qwavedecoder_wrapper.cpp ${QtMultimedia_GEN_DIR}/qwindowcapture_wrapper.cpp # module is always needed diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index d37eb15fd..2791f695a 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -154,6 +154,9 @@ <inject-code file="../glue/qtmultimedia.cpp" snippet="qvideoframe-bits"/> </modify-function> <modify-function signature="bits(int)const" remove="all"/> + <value-type name="PaintOptions"> + <enum-type name="PaintFlag" flags="PaintFlags"/> + </value-type> </value-type> <value-type name="QVideoFrameFormat" since="6.1"> <enum-type name="ColorSpace" since="6.4"/> @@ -164,6 +167,11 @@ <enum-type name="YCbCrColorSpace"/> </value-type> + <object-type name="QWaveDecoder"> + <!-- No implementation --> + <modify-function signature="setIODevice(QIODevice*)" remove="all"/> + </object-type> + <object-type name="QWindowCapture" since="6.6"> <enum-type name="Error"/> </object-type> diff --git a/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt b/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt index e7c8586e4..529e2e86b 100644 --- a/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt @@ -18,6 +18,7 @@ ${QtNetwork_GEN_DIR}/qdnstextrecord_wrapper.cpp ${QtNetwork_GEN_DIR}/qhostaddress_wrapper.cpp ${QtNetwork_GEN_DIR}/qhostinfo_wrapper.cpp ${QtNetwork_GEN_DIR}/qhstspolicy_wrapper.cpp +${QtNetwork_GEN_DIR}/qhttp1configuration_wrapper.cpp ${QtNetwork_GEN_DIR}/qhttpheaders_wrapper.cpp ${QtNetwork_GEN_DIR}/qhttpmultipart_wrapper.cpp ${QtNetwork_GEN_DIR}/qhttppart_wrapper.cpp @@ -84,7 +85,8 @@ if("dtls" IN_LIST QtNetwork_disabled_features) else() list(APPEND QtNetwork_SRC ${QtNetwork_GEN_DIR}/qdtls_wrapper.cpp - ${QtNetwork_GEN_DIR}/qdtlsclientverifier_wrapper.cpp) + ${QtNetwork_GEN_DIR}/qdtlsclientverifier_wrapper.cpp + ${QtNetwork_GEN_DIR}/qdtlsclientverifier_generatorparameters_wrapper.cpp) message(STATUS "Qt${QT_MAJOR_VERSION}Network: Adding DTLS classes") endif() diff --git a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml index 4c1efc8b2..508043626 100644 --- a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml +++ b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml @@ -76,11 +76,15 @@ </object-type> <object-type name="QDtlsClientVerifier"> <configuration condition="QT_CONFIG(dtls)"/> + <value-type name="GeneratorParameters"> + <configuration condition="QT_CONFIG(dtls)"/> + </value-type> </object-type> <value-type name="QHstsPolicy"> <enum-type name="PolicyFlag" flags="PolicyFlags"/> </value-type> + <value-type name="QHttp1Configuration"/> <value-type name="QHttpHeaders" since="6.7"> <enum-type name="WellKnownHeader"/> </value-type> diff --git a/sources/pyside6/PySide6/QtNfc/CMakeLists.txt b/sources/pyside6/PySide6/QtNfc/CMakeLists.txt index 7ecb6e73a..b94249a55 100644 --- a/sources/pyside6/PySide6/QtNfc/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtNfc/CMakeLists.txt @@ -14,6 +14,7 @@ set(QtNfc_SRC ${QtNfc_GEN_DIR}/qndefnfcurirecord_wrapper.cpp ${QtNfc_GEN_DIR}/qnearfieldmanager_wrapper.cpp ${QtNfc_GEN_DIR}/qnearfieldtarget_wrapper.cpp + ${QtNfc_GEN_DIR}/qnearfieldtarget_requestid_wrapper.cpp # module is always needed ${QtNfc_GEN_DIR}/qtnfc_module_wrapper.cpp) diff --git a/sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml b/sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml index 51f5fa9bc..b548227f0 100644 --- a/sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml +++ b/sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml @@ -28,6 +28,7 @@ <enum-type name="AccessMethod" flags="AccessMethods"/> <enum-type name="Error"/> <enum-type name="Type"/> + <value-type name="RequestId"/> </object-type> <!-- QtNetwork is pulled in via QtNfcDepends. --> <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls).*' does not have a type entry.*$"/> diff --git a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml index bd031cc49..efbd16056 100644 --- a/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside6/PySide6/QtOpenGL/typesystem_opengl.xml @@ -625,7 +625,7 @@ </object-type> <value-type name="QOpenGLFramebufferObjectFormat"/> <object-type name="QAbstractOpenGLFunctions"/> - <value-type name="QOpenGLPixelTransferOptions"/> + <value-type name="QOpenGLPixelTransferOptions"/> <object-type name="QOpenGLShader"> <enum-type name="ShaderTypeBit" flags="ShaderType"/> </object-type> diff --git a/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt b/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt index 874b8ada0..cad6dcb74 100644 --- a/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtPositioning/CMakeLists.txt @@ -23,6 +23,7 @@ ${QtPositioning_GEN_DIR}/qgeosatelliteinfo_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeosatelliteinfosource_wrapper.cpp ${QtPositioning_GEN_DIR}/qgeoshape_wrapper.cpp ${QtPositioning_GEN_DIR}/qnmeapositioninfosource_wrapper.cpp +${QtPositioning_GEN_DIR}/qnmeasatelliteinfosource_wrapper.cpp # module is always needed ${QtPositioning_GEN_DIR}/qtpositioning_module_wrapper.cpp ) diff --git a/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml b/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml index e7f9fd254..8dac3f00d 100644 --- a/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml +++ b/sources/pyside6/PySide6/QtPositioning/typesystem_positioning.xml @@ -44,4 +44,8 @@ <object-type name="QNmeaPositionInfoSource"> <enum-type name="UpdateMode"/> </object-type> + <object-type name="QNmeaSatelliteInfoSource"> + <enum-type name="UpdateMode"/> + <enum-type name="SatelliteInfoParseStatus"/> + </object-type> </typesystem> diff --git a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt index a42b655db..775230242 100644 --- a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt @@ -37,6 +37,7 @@ ${QtQuick_GEN_DIR}/qquickrhiitem_wrapper.cpp ${QtQuick_GEN_DIR}/qquicktextdocument_wrapper.cpp ${QtQuick_GEN_DIR}/qquickview_wrapper.cpp ${QtQuick_GEN_DIR}/qquickwindow_wrapper.cpp +${QtQuick_GEN_DIR}/qquickwindow_graphicsstateinfo_wrapper.cpp ${QtQuick_GEN_DIR}/qsgbasicgeometrynode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgclipnode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgdynamictexture_wrapper.cpp @@ -48,16 +49,21 @@ ${QtQuick_GEN_DIR}/qsggeometry_point2d_wrapper.cpp ${QtQuick_GEN_DIR}/qsggeometry_texturedpoint2d_wrapper.cpp ${QtQuick_GEN_DIR}/qsggeometry_wrapper.cpp ${QtQuick_GEN_DIR}/qsggeometrynode_wrapper.cpp +${QtQuick_GEN_DIR}/qsgimagenode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgmaterial_wrapper.cpp ${QtQuick_GEN_DIR}/qsgmaterialshader_wrapper.cpp +${QtQuick_GEN_DIR}/qsgmaterialshader_graphicspipelinestate_wrapper.cpp ${QtQuick_GEN_DIR}/qsgmaterialtype_wrapper.cpp +${QtQuick_GEN_DIR}/qsgninepatchnode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgnode_wrapper.cpp +${QtQuick_GEN_DIR}/qsgnodevisitor_wrapper.cpp ${QtQuick_GEN_DIR}/qsgopacitynode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgopaquetexturematerial_wrapper.cpp #${QtQuick_GEN_DIR}/qsgsimplematerial_wrapper.cpp #${QtQuick_GEN_DIR}/qsgsimplematerialshader_wrapper.cpp ${QtQuick_GEN_DIR}/qsgrectanglenode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgrendernode_wrapper.cpp +${QtQuick_GEN_DIR}/qsgrootnode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgsimplerectnode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgsimpletexturenode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgrendererinterface_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml index 0bfb744c7..0a24123f4 100644 --- a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml +++ b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml @@ -112,6 +112,7 @@ <enum-type name="RenderStage"/> <enum-type name="SceneGraphError"/> <enum-type name="TextRenderType"/> + <value-type name="GraphicsStateInfo"/> </object-type> <object-type name="QSGBasicGeometryNode"> @@ -167,6 +168,10 @@ </modify-function> </object-type> + <object-type name="QSGImageNode"> + <enum-type name="TextureCoordinatesTransformFlag" flags="TextureCoordinatesTransformMode"/> + </object-type> + <object-type name="QSGMaterial"> <enum-type name="Flag" flags="Flags"/> </object-type> @@ -176,16 +181,25 @@ <value-type name="RenderState"> <enum-type name="DirtyState" flags="DirtyStates"/> </value-type> + <value-type name="GraphicsPipelineState"> + <enum-type name="BlendFactor"/> + <enum-type name="ColorMaskComponent" flags="ColorMask"/> + <enum-type name="CullMode"/> + <enum-type name="PolygonMode"/> + </value-type> <modify-function signature="updateSampledImage(QSGMaterialShader::RenderState&,int,QSGTexture**,QSGMaterial*,QSGMaterial*)" remove="all"/> <!-- Private QRhi class --> <modify-function signature="setShader(QSGMaterialShader::Stage,QShader)" remove="all"/> </object-type> <object-type name="QSGMaterialType"/> + <object-type name="QSGNinePatchNode"/> <object-type name="QSGNode"> <enum-type name="DirtyStateBit" flags="DirtyState"/> <enum-type name="Flag" flags="Flags"/> <enum-type name="NodeType"/> </object-type> + <object-type name="QSGNodeVisitor"/> + <object-type name="QSGOpacityNode"/> <object-type name="QSGOpaqueTextureMaterial"/> <object-type name="QSGSimpleRectNode"/> @@ -210,6 +224,7 @@ <enum-type name="RenderingFlag" flags="RenderingFlags"/> <object-type name="RenderState"/> </object-type> + <object-type name="QSGRootNode"/> <object-type name="QSGTexture"> <enum-type name="AnisotropyLevel"/> <enum-type name="Filtering"/> diff --git a/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt b/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt index 72c046a57..9951d2e1e 100644 --- a/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt @@ -7,6 +7,7 @@ set (QtQuickControls2_DROPPED_ENTRIES) set(QtQuickControls2_SRC ${QtQuickControls2_GEN_DIR}/qquickstyle_wrapper.cpp +${QtQuickControls2_GEN_DIR}/qquickattachedpropertypropagator_wrapper.cpp # module is always needed ${QtQuickControls2_GEN_DIR}/qtquickcontrols2_module_wrapper.cpp ) diff --git a/sources/pyside6/PySide6/QtQuickControls2/typesystem_quickcontrols2.xml b/sources/pyside6/PySide6/QtQuickControls2/typesystem_quickcontrols2.xml index 401340522..72fc05226 100644 --- a/sources/pyside6/PySide6/QtQuickControls2/typesystem_quickcontrols2.xml +++ b/sources/pyside6/PySide6/QtQuickControls2/typesystem_quickcontrols2.xml @@ -8,5 +8,6 @@ <load-typesystem name="QtQuick/typesystem_quick.xml" generate="no"/> <object-type name="QQuickStyle"/> + <object-type name="QQuickAttachedPropertyPropagator"/> </typesystem> diff --git a/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt b/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt index 8d7126bb1..07835b2f6 100644 --- a/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt @@ -5,6 +5,7 @@ project(QtRemoteObjects) set(QtRemoteObjects_SRC ${QtRemoteObjects_GEN_DIR}/qabstractitemmodelreplica_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qconnectionabstractserver_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectabstractpersistedstore_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectdynamicreplica_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjecthost_wrapper.cpp @@ -18,6 +19,11 @@ ${QtRemoteObjects_GEN_DIR}/qremoteobjectreplica_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qtremoteobjects_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectsettingsstore_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectsourcelocationinfo_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qtroclientfactory_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qtroclientiodevice_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qtroiodevicebase_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qtroserverfactory_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qtroserveriodevice_wrapper.cpp # module is always needed ${QtRemoteObjects_GEN_DIR}/qtremoteobjects_module_wrapper.cpp @@ -29,7 +35,8 @@ set(QtRemoteObjects_include_dirs ${QtRemoteObjects_SOURCE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} ${SHIBOKEN_PYTHON_INCLUDE_DIR} - ${QtCore_GEN_DIR}) + ${QtCore_GEN_DIR} + ${QtNetwork_GEN_DIR}) set(QtRemoteObjects_libraries pyside6 ${Qt${QT_MAJOR_VERSION}RemoteObjects_LIBRARIES}) diff --git a/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml b/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml index 9e351d0e0..86e4d9093 100644 --- a/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml +++ b/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml @@ -7,6 +7,7 @@ namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="templates/core_common.xml" generate="no"/> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <rejection class="QRemoteObjectStringLiterals"/> <rejection class="*" function-name="getTypeNameAndMetaobjectFromClassInfo"/> @@ -16,6 +17,7 @@ <enum-type name="QRemoteObjectPacketTypeEnum"/> </namespace-type> <object-type name="QAbstractItemModelReplica"/> + <object-type name="QConnectionAbstractServer"/> <object-type name="QRemoteObjectAbstractPersistedStore"/> <object-type name="QRemoteObjectDynamicReplica"/> <object-type name="QRemoteObjectHost"/> @@ -37,6 +39,11 @@ </object-type> <object-type name="QRemoteObjectSettingsStore"/> <value-type name="QRemoteObjectSourceLocationInfo"/> + <object-type name="QtROClientFactory"/> + <object-type name="QtROClientIoDevice"/> + <object-type name="QtROIoDeviceBase"/> + <object-type name="QtROServerFactory"/> + <object-type name="QtROServerIoDevice"/> <suppress-warning text="^.*Typedef used on signal QRemoteObject.*$"/> <suppress-warning text="^QRemoteObjectPendingCallWatcher inherits from a non polymorphic type.*$"/> diff --git a/sources/pyside6/PySide6/QtSerialBus/CMakeLists.txt b/sources/pyside6/PySide6/QtSerialBus/CMakeLists.txt index f3bf0c805..310a8b0f0 100644 --- a/sources/pyside6/PySide6/QtSerialBus/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtSerialBus/CMakeLists.txt @@ -8,25 +8,35 @@ set(QtSerialBus_DROPPED_ENTRIES ) set(QtSerialBus_SRC ${QtSerialBus_GEN_DIR}/qcanbus_wrapper.cpp - ${QtSerialBus_GEN_DIR}/qcanbusdevice_wrapper.cpp ${QtSerialBus_GEN_DIR}/qcanbusdevice_filter_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcanbusdevice_wrapper.cpp ${QtSerialBus_GEN_DIR}/qcanbusdeviceinfo_wrapper.cpp ${QtSerialBus_GEN_DIR}/qcanbusfactory_wrapper.cpp - ${QtSerialBus_GEN_DIR}/qcanbusframe_wrapper.cpp ${QtSerialBus_GEN_DIR}/qcanbusframe_timestamp_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcanbusframe_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcandbcfileparser_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcanframeprocessor_parseresult_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcanframeprocessor_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcanmessagedescription_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcansignaldescription_multiplexvaluerange_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcansignaldescription_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qcanuniqueiddescription_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusclient_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusdataunit_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusdevice_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusdeviceidentification_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qmodbusexceptionresponse_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbuspdu_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusreply_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusrequest_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qmodbusresponse_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusrtuserialclient_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusrtuserialserver_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbusserver_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbustcpclient_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbustcpconnectionobserver_wrapper.cpp ${QtSerialBus_GEN_DIR}/qmodbustcpserver_wrapper.cpp + ${QtSerialBus_GEN_DIR}/qtcanbus_wrapper.cpp # module is always needed ${QtSerialBus_GEN_DIR}/qtserialbus_module_wrapper.cpp ) diff --git a/sources/pyside6/PySide6/QtSerialBus/typesystem_serialbus.xml b/sources/pyside6/PySide6/QtSerialBus/typesystem_serialbus.xml index e565e0663..fdd2b1483 100644 --- a/sources/pyside6/PySide6/QtSerialBus/typesystem_serialbus.xml +++ b/sources/pyside6/PySide6/QtSerialBus/typesystem_serialbus.xml @@ -10,6 +10,13 @@ <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <load-typesystem name="QtSerialPort/typesystem_serialport.xml" generate="no"/> + <namespace-type name="QtCanBus"> + <enum-type name="DataSource"/> + <enum-type name="DataFormat"/> + <enum-type name="MultiplexState"/> + <enum-type name="UniqueId"/> + </namespace-type> + <object-type name="QCanBus"> <!-- Remove errorMessage argument, return tuple instead. --> <modify-function signature="availableDevices(QString,QString*)const"> @@ -62,6 +69,18 @@ <enum-type name="FrameError" flags="FrameErrors"/> <value-type name="TimeStamp"/> </value-type> + <object-type name="QCanDbcFileParser"> + <enum-type name="Error"/> + </object-type> + <object-type name="QCanFrameProcessor"> + <enum-type name="Error"/> + <value-type name="ParseResult"/> + </object-type> + <value-type name="QCanMessageDescription"/> + <value-type name="QCanSignalDescription"> + <value-type name="MultiplexValueRange"/> + </value-type> + <value-type name="QCanUniqueIdDescription"/> <object-type name="QModbusClient"/> <value-type name="QModbusDataUnit"> <enum-type name="RegisterType"/> @@ -82,6 +101,8 @@ <enum-type name="FunctionCode"/> <modify-field name="ExceptionByte" remove="true"/> <!-- Link error --> </object-type> + <object-type name="QModbusExceptionResponse"/> + <object-type name="QModbusResponse"/> <object-type name="QModbusReply"> <enum-type name="ReplyType"/> </object-type> diff --git a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt index 2aa7d0b9e..0cdaf2f91 100644 --- a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt @@ -5,6 +5,8 @@ project(QtWebEngineCore) set(QtWebEngineCore_SRC ${QtWebEngineCore_GEN_DIR}/qwebenginecertificateerror_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineclientcertificateselection_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineclientcertificatestore_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginecontextmenurequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginecookiestore_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginecookiestore_filterrequest_wrapper.cpp @@ -13,10 +15,13 @@ ${QtWebEngineCore_GEN_DIR}/qwebenginedownloadrequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginefilesystemaccessrequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginefindtextresult_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginefullscreenrequest_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineglobalsettings_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineglobalsettings_dnsmode_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginehistory_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginehistoryitem_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginehistorymodel_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginehttprequest_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebenginenavigationrequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineloadinginfo_wrapper.cpp # FIXME ${QtWebEngineCore_GEN_DIR}/qwebenginemediasourcemodel_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginenewwindowrequest_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml index ae0cbbbf1..da9259ccc 100644 --- a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml +++ b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml @@ -17,6 +17,9 @@ <function signature="qWebEngineChromiumSecurityPatchVersion()"/> <function signature="qWebEngineVersion()"/> + <value-type name="QWebEngineClientCertificateSelection"/> + <object-type name="QWebEngineClientCertificateStore"/> + <object-type name="QWebEngineCookieStore"> <inject-code class="native" position="beginning" file="../glue/qtwebenginecore.cpp" snippet="qwebenginecookiestore-functor"/> @@ -61,6 +64,11 @@ <enum-type name="Roles"/> </object-type> + <object-type name="QWebEngineNavigationRequest"> + <enum-type name="NavigationType"/> + <enum-type name="NavigationRequestAction"/> + </object-type> + <object-type name="QWebEngineNotification"/> <object-type name="QWebEnginePage"> @@ -173,6 +181,10 @@ <enum-type name="PinEntryError"/> <enum-type name="RequestFailureReason"/> </object-type> + <namespace-type name="QWebEngineGlobalSettings"> + <enum-type name="SecureDnsMode"/> + <value-type name="DnsMode"/> + </namespace-type> <!-- QtQml is pulled in via QtWebEngineCoreDepends. --> <suppress-warning text="^Scoped enum 'QQml.*' does not have a type entry.*$"/> diff --git a/sources/pyside6/PySide6/QtXml/CMakeLists.txt b/sources/pyside6/PySide6/QtXml/CMakeLists.txt index 82001cc60..b0e4630dd 100644 --- a/sources/pyside6/PySide6/QtXml/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtXml/CMakeLists.txt @@ -9,6 +9,7 @@ ${QtXml_GEN_DIR}/qdomcdatasection_wrapper.cpp ${QtXml_GEN_DIR}/qdomcharacterdata_wrapper.cpp ${QtXml_GEN_DIR}/qdomcomment_wrapper.cpp ${QtXml_GEN_DIR}/qdomdocument_wrapper.cpp +${QtXml_GEN_DIR}/qdomdocument_parseresult_wrapper.cpp ${QtXml_GEN_DIR}/qdomdocumentfragment_wrapper.cpp ${QtXml_GEN_DIR}/qdomdocumenttype_wrapper.cpp ${QtXml_GEN_DIR}/qdomelement_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtXml/typesystem_xml.xml b/sources/pyside6/PySide6/QtXml/typesystem_xml.xml index 1d6b20c28..3661a67bf 100644 --- a/sources/pyside6/PySide6/QtXml/typesystem_xml.xml +++ b/sources/pyside6/PySide6/QtXml/typesystem_xml.xml @@ -19,6 +19,9 @@ <value-type name="QDomDocument"> <enum-type name="ParseOption" flags="ParseOptions" since="6.5"/> <!-- will be replaced in inject code --> + + <value-type name="ParseResult"/> + <modify-function signature="setContent(const QByteArray&,bool,QString*,int*,int*)"> <modify-argument index="3"> <remove-argument/> |