aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-02-22 09:26:00 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-03-19 11:27:38 +0000
commit9cc6c201c701b4ebba9344a9f9f0a1d456c5ebee (patch)
treea646dd49bed97d0d5976a32c4a02634e7e5f3c45 /sources/pyside2/PySide2
parent889bb04611f3852c68cb9f2736f0b7cbc0aa1597 (diff)
Add new API of Qt 5.11
Task-number: PYSIDE-487 Change-Id: I67ce74f06bba2f0161bb6e49be5aa8d7cfeea793 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/PySide2')
-rw-r--r--sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt8
-rw-r--r--sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml9
-rw-r--r--sources/pyside2/PySide2/QtCore/typesystem_core_common.xml2
-rw-r--r--sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt5
-rw-r--r--sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml1
-rw-r--r--sources/pyside2/PySide2/QtNetwork/typesystem_network.xml5
6 files changed, 29 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 cfa332742..013c79f37 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/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 554111e35..2b838945d 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -1785,6 +1785,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*">
@@ -2031,6 +2032,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"/>
diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
index cfca07862..030426b05 100644
--- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
@@ -82,6 +82,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 8058954a1..35effbc73 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -264,6 +264,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 06a402e3c..4e47c6ef5 100644
--- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
+++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
@@ -192,10 +192,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">