diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-22 09:26:00 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-19 11:27:38 +0000 |
| commit | 9cc6c201c701b4ebba9344a9f9f0a1d456c5ebee (patch) | |
| tree | a646dd49bed97d0d5976a32c4a02634e7e5f3c45 /sources/pyside2/PySide2/QtMultimedia | |
| parent | 889bb04611f3852c68cb9f2736f0b7cbc0aa1597 (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/QtMultimedia')
| -rw-r--r-- | sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml | 1 |
2 files changed, 6 insertions, 0 deletions
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"/> |