diff options
Diffstat (limited to 'sources/pyside2/PySide2')
8 files changed, 43 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt index 07bd3d89f..1b859ca1e 100644 --- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt @@ -117,6 +117,14 @@ if (Qt53DRender_VERSION VERSION_EQUAL 5.10.0 OR Qt53DRender_VERSION VERSION_GREA ) endif() +if (Qt53DRender_VERSION VERSION_EQUAL 5.11.0 OR Qt53DRender_VERSION VERSION_GREATER 5.11.0) + list(APPEND Qt3DRender_SRC + ${Qt3DRender_GEN_DIR}/qt3drender_qabstractraycaster_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qraycaster_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qraycasterhit_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qscreenraycaster_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 037fddd44..44274766f 100644 --- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml +++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml @@ -48,6 +48,10 @@ <object-type name="QAbstractLight"> <enum-type name="Type"/> </object-type> + <object-type name="QAbstractRayCaster" since="5.11"> + <enum-type name="RunMode"/> + <enum-type name="FilterMode"/> + </object-type> <object-type name="QAbstractTexture"> <enum-type name="CubeMapFace"/> <enum-type name="ComparisonFunction"/> @@ -163,6 +167,10 @@ </object-type> <object-type name="QPolygonOffset"/> <object-type name="QProximityFilter" since="5.10"/> + <object-type name="QRayCaster" since="5.11"/> + <value-type name="QRayCasterHit" since="5.11"> + <enum-type name="HitType"/> + </value-type> <object-type name="QRenderAspect"> <enum-type name="RenderType"/> </object-type> @@ -186,6 +194,7 @@ <enum-type name="ComponentType"/> </object-type> <object-type name="QScissorTest"/> + <object-type name="QScreenRayCaster" since="5.11"/> <object-type name="QSeamlessCubemap"/> <object-type name="QShaderData"/> <object-type name="QShaderProgram"> diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index f086a3f3d..1d0b7d413 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -96,6 +96,8 @@ ${QtCore_GEN_DIR}/qpointf_wrapper.cpp ${QtCore_GEN_DIR}/qprocess_wrapper.cpp ${QtCore_GEN_DIR}/qprocessenvironment_wrapper.cpp ${QtCore_GEN_DIR}/qpropertyanimation_wrapper.cpp +${QtCore_GEN_DIR}/qrandomgenerator_wrapper.cpp +${QtCore_GEN_DIR}/qrandomgenerator64_wrapper.cpp ${QtCore_GEN_DIR}/qreadlocker_wrapper.cpp ${QtCore_GEN_DIR}/qreadwritelock_wrapper.cpp ${QtCore_GEN_DIR}/qrect_wrapper.cpp @@ -108,6 +110,7 @@ ${QtCore_GEN_DIR}/qresource_wrapper.cpp ${QtCore_GEN_DIR}/qrunnable_wrapper.cpp ${QtCore_GEN_DIR}/qsavefile_wrapper.cpp ${QtCore_GEN_DIR}/qsemaphore_wrapper.cpp +${QtCore_GEN_DIR}/qsemaphorereleaser_wrapper.cpp ${QtCore_GEN_DIR}/qsequentialanimationgroup_wrapper.cpp ${QtCore_GEN_DIR}/qsettings_wrapper.cpp ${QtCore_GEN_DIR}/qsignalblocker_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 501f2253f..47d43f2eb 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1794,6 +1794,7 @@ </value-type> <value-type name="QUuid"> + <enum-type name="StringFormat" since="5.11"/> <enum-type name="Variant"/> <enum-type name="Version"/> <add-function signature="__repr__" return-type="PyObject*"> @@ -1821,6 +1822,7 @@ <value-type name="QLocale"> <enum-type name="Country" /> + <enum-type name="DataSizeFormat" flags="DataSizeFormats" since="5.10"/> <enum-type name="FloatingPointPrecisionOption" since="5.7"/> <enum-type name="FormatType"/> <enum-type name="Language" /> @@ -2045,6 +2047,7 @@ </object-type> <object-type name="QAbstractItemModel"> + <enum-type name="CheckIndexOption" flags="CheckIndexOptions" class="yes" since="5.11"/> <enum-type name="LayoutChangeHint" /> <!-- This function was replaced by a added function --> <modify-function signature="createIndex(int,int,void*)const" remove="all"/> @@ -2920,6 +2923,7 @@ </object-type> <object-type name="QFileDevice" since="5.0"> <enum-type name="FileError"/> + <enum-type name="FileTime" since="5.10"/> <enum-type name="MemoryMapFlags"/> <enum-type name="Permission" flags="Permissions"/> <enum-type name="FileHandleFlag" flags="FileHandleFlags"/> @@ -3084,10 +3088,18 @@ <modify-function signature="lock()" allow-thread="yes"/> <modify-function signature="tryLock(int)" allow-thread="yes"/> </object-type> + <object-type name="QRandomGenerator" since="5.10"> + <modify-function signature="global()" rename="global_" allow-thread="yes" /> + <modify-function signature="operator()()" remove="all"/> + </object-type> + <object-type name="QRandomGenerator64" since="5.10"> + <modify-function signature="operator()()" remove="all"/> + </object-type> <object-type name="QSemaphore"> <modify-function signature="acquire(int)" allow-thread="yes"/> <modify-function signature="tryAcquire(int,int)" allow-thread="yes"/> </object-type> + <object-type name="QSemaphoreReleaser" since="5.10"/> <object-type name="QSocketNotifier"> <enum-type name="Type"/> diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt index a89ba8fe8..e9caaa64b 100644 --- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt @@ -97,6 +97,11 @@ ${QtMultimedia_GEN_DIR}/qvideowindowcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qtmultimedia_module_wrapper.cpp ) +if (Qt5Multimedia_VERSION VERSION_EQUAL 5.11.0 OR Qt5Multimedia_VERSION VERSION_GREATER 5.11.0) + list(APPEND QtMultimedia_SRC + ${QtMultimedia_GEN_DIR}/qcustomaudiorolecontrol_wrapper.cpp) +endif() + set(QtMultimedia_include_dirs ${QtMultimedia_SOURCE_DIR} ${QtMultimedia_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index 011f35935..5486fb157 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml @@ -269,6 +269,7 @@ <value-type name="QMediaContent"/> <object-type name="QMediaGaplessPlaybackControl"/> <object-type name="QMediaControl"/> + <object-type name="QCustomAudioRoleControl" since="5.11"/> <object-type name="QMediaNetworkAccessControl"/> <!-- Causes compile errors <namespace-type name="QMediaMetaData"/> diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml index a9040c318..e4235e070 100644 --- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml +++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml @@ -209,10 +209,13 @@ <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/> </value-type> - <value-type name="QNetworkAddressEntry" /> + <value-type name="QNetworkAddressEntry"> + <enum-type name="DnsEligibilityStatus" since="5.11"/> + </value-type> <value-type name="QNetworkInterface"> <enum-type name="InterfaceFlag" flags="InterfaceFlags"/> + <enum-type name="InterfaceType" since="5.11"/> </value-type> <value-type name="QNetworkProxy"> diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index 564968a3c..86c12f888 100644 --- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml +++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml @@ -57,6 +57,7 @@ <rejection class="QTest" function-name="toHexRepresentation"/> <rejection class="QTest" function-name="qWait"/> <rejection class="QTest" function-name="qFail"/> + <rejection class="QTest" function-name="qInit"/> <rejection class="QTest" function-name="qExec"/> <rejection class="QTest" function-name="qData"/> <rejection class="QTest" function-name="qWarn"/> |