diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-21 10:10:19 +0100 |
---|---|---|
committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2019-03-20 17:28:41 +0000 |
commit | 0829139d8895f8d23c4d8d4105cfac2464994483 (patch) | |
tree | 8092618865dc31c89abb79c81460c9c32ae3e7b5 | |
parent | 84234b3987fa8f78024b650bb0596e64a2030a0e (diff) |
Add bindings for 5.13
Task-number: PYSIDE-487
Change-Id: I789e0f13062c254fe1766eb10fd68f3bb3373594
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
8 files changed, 45 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt index c8bf08f4c..73c0c5ba6 100644 --- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt @@ -125,6 +125,13 @@ if (Qt53DRender_VERSION VERSION_EQUAL 5.11.0 OR Qt53DRender_VERSION VERSION_GREA ${Qt3DRender_GEN_DIR}/qt3drender_qscreenraycaster_wrapper.cpp) endif() +if (Qt53DRender_VERSION VERSION_EQUAL 5.13.0 OR Qt53DRender_VERSION VERSION_GREATER 5.13.0) + list(APPEND Qt3DRender_SRC + ${Qt3DRender_GEN_DIR}/qt3drender_qsetfence_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qsharedgltexture_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qwaitfence_wrapper.cpp) +endif() + set(Qt3DRender_include_dirs ${Qt3DRender_SOURCE_DIR} ${Qt3DRender_BINARY_DIR} diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml index 851f46b14..9843a4591 100644 --- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml +++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml @@ -56,6 +56,7 @@ <enum-type name="CubeMapFace"/> <enum-type name="ComparisonFunction"/> <enum-type name="ComparisonMode"/> + <enum-type name="HandleType" since="5.13"/> <enum-type name="Filter"/> <enum-type name="Status"/> <enum-type name="Target"/> @@ -102,7 +103,9 @@ </object-type> <object-type name="QClipPlane"/> <object-type name="QColorMask"/> - <object-type name="QComputeCommand"/> + <object-type name="QComputeCommand"> + <enum-type name="RunType" since="5.13"/> + </object-type> <object-type name="QCullFace"> <enum-type name="CullingMode"/> </object-type> @@ -202,12 +205,16 @@ <object-type name="QScissorTest"/> <object-type name="QScreenRayCaster" since="5.11"/> <object-type name="QSeamlessCubemap"/> + <object-type name="QSetFence" since="5.13"> + <enum-type name="HandleType"/> + </object-type> <object-type name="QShaderData"/> <object-type name="QShaderProgram"> <enum-type name="ShaderType"/> <enum-type name="Status"/> </object-type> <object-type name="QShaderProgramBuilder" since="5.10"/> + <object-type name="QSharedGLTexture" since="5.13"/> <object-type name="QSortPolicy"> <enum-type name="SortType"/> </object-type> @@ -252,5 +259,8 @@ <enum-type name="WrapMode"/> </object-type> <object-type name="QViewport"/> + <object-type name="QWaitFence" since="5.13"> + <enum-type name="HandleType"/> + </object-type> </namespace-type> </typesystem> diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index 5725c0121..c385803a7 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -180,6 +180,12 @@ ${SPECIFIC_OS_FILES} ${QtCore_GEN_DIR}/qtcore_module_wrapper.cpp ) +if (Qt5Core_VERSION VERSION_EQUAL 5.13.0 OR Qt5Core_VERSION VERSION_GREATER 5.13.0) + list(APPEND QtCore_SRC + ${QtCore_GEN_DIR}/qconcatenatetablesproxymodel_wrapper.cpp + ${QtCore_GEN_DIR}/qtransposeproxymodel_wrapper.cpp) +endif() + set(QtCore_glue_sources "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.cpp" "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.h" diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 7531b33b8..17773be05 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -761,6 +761,7 @@ </modify-function> </value-type> <object-type name="QResource"> + <enum-type name="Compression" since="5.13"/> <modify-function signature="data()const"> <inject-documentation format="target"> Returns a read only buffer object pointing to the segment of data that this resource represents. If the resource is compressed the data returns is compressed and qUncompress() must be used to access the data. If the resource is a directory None is returned. @@ -1530,6 +1531,7 @@ <include file-name="QSize" location="global"/> </extra-includes> </object-type> + <object-type name="QConcatenateTablesProxyModel" since="5.13"/> <object-type name="QSortFilterProxyModel"> <extra-includes> <include file-name="QItemSelection" location="global"/> @@ -1547,6 +1549,7 @@ <!--### End of obsolete section --> </object-type> <object-type name="QIdentityProxyModel"/> + <object-type name="QTransposeProxyModel" since="5.13"/> <!-- QObject is created manually --> <object-type name="QObject"> <extra-includes> diff --git a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt index 66086b607..4262bcd1a 100644 --- a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt @@ -17,6 +17,13 @@ ${QtHelp_GEN_DIR}/qhelpsearchresultwidget_wrapper.cpp ${QtHelp_GEN_DIR}/qthelp_module_wrapper.cpp ) +if (Qt5Help_VERSION VERSION_EQUAL 5.13.0 OR Qt5Help_VERSION VERSION_GREATER 5.13.0) + list(APPEND QtHelp_SRC + ${QtHelp_GEN_DIR}/qcompressedhelpinfo_wrapper.cpp + ${QtHelp_GEN_DIR}/qhelpfilterdata_wrapper.cpp + ${QtHelp_GEN_DIR}/qhelpfilterengine_wrapper.cpp) +endif() + set(QtHelp_include_dirs ${QtHelp_SOURCE_DIR} ${QtHelp_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} diff --git a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml index 287d6374e..922dcde5d 100644 --- a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml +++ b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml @@ -43,6 +43,7 @@ <typesystem package="PySide2.QtHelp"> <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> + <value-type name="QCompressedHelpInfo" since="5.13"/> <value-type name="QHelpContentItem"> <modify-function signature="parent()const"> <modify-argument index="return"> @@ -54,6 +55,8 @@ <object-type name="QHelpContentWidget"/> <object-type name="QHelpEngine"/> <object-type name="QHelpEngineCore"/> + <value-type name="QHelpFilterData" since="5.13"/> + <object-type name="QHelpFilterEngine" since="5.13"/> <object-type name="QHelpIndexModel"/> <object-type name="QHelpIndexWidget"/> <object-type name="QHelpSearchEngine"/> diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index 52092c2a2..488f79757 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -54,7 +54,7 @@ list(FIND QtNetwork_disabled_features "dtls" _dtlsDisabledIndex) list(FIND QtNetwork_disabled_features "sctp" _sctpDisabledIndex) if(_sslEnabledIndex EQUAL -1) - list(APPEND QtNetwork_DROPPED_ENTRIES QSslCertificate QSslCertificateExtension + list(APPEND QtNetwork_DROPPED_ENTRIES QOcspResponse QSslCertificate QSslCertificateExtension QSslCipher QSslConfiguration QSslDiffieHellmanParameters QSslError QSslKey QSslPreSharedKeyAuthenticator QSslSocket) message(STATUS "Qt5Network: Dropping SSL classes") @@ -71,6 +71,10 @@ else() ${QtNetwork_GEN_DIR}/qsslkey_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslpresharedkeyauthenticator_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslsocket_wrapper.cpp) + if (Qt5Network_VERSION VERSION_EQUAL 5.13.0 OR Qt5Network_VERSION VERSION_GREATER 5.13.0) + list(APPEND QtNetwork_SRC + ${QtNetwork_GEN_DIR}/qocspresponse_wrapper.cpp) + endif() message(STATUS "Qt5Network: Adding SSL classes") endif() diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml index 3ffd9077e..897b2efbc 100644 --- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml +++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml @@ -43,6 +43,8 @@ <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <enum-type name="QDtlsError" since="5.12"/> + <enum-type name="QOcspCertificateStatus" since="5.13"/> + <enum-type name="QOcspRevocationReason" since="5.13"/> <namespace-type name="QPasswordDigestor" since="5.12"> <extra-includes> @@ -118,6 +120,7 @@ </inject-code> </modify-function> </object-type> + <value-type name="QOcspResponse" since="5.13"/> <object-type name="QTcpSocket"/> <object-type name="QUdpSocket"> <modify-function signature="readDatagram(char*,qint64,QHostAddress*,quint16*)" allow-thread="yes"> |