diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-09 10:28:29 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-09 15:07:40 +0000 |
| commit | 9aa62716c5cb7c83d963075d4b60446d37752796 (patch) | |
| tree | 251cd63536946f2c1f46ab72d8c700e680e4a15c | |
| parent | dca8a536eb7bbbaa4e74794abafa9075cdbff95f (diff) | |
PySide6: Add missing enumerations and network classes
Amends e72dc6d88f85fea451338523058e0407e8c8f0b5.
Task-number: PYSIDE-1482
Change-Id: I4eea6fc9949ef2307d3b30e18cf2801e8b56d6bb
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 22dcdb7d079ed5eebbd904ef6cea82828fbb8c48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/PySide6/QtNetwork/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtNetwork/typesystem_network.xml | 1 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtQuick/typesystem_quick.xml | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt b/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt index 830cce93f..2eb360b61 100644 --- a/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt @@ -71,11 +71,12 @@ else() endif() if("dtls" IN_LIST QtNetwork_disabled_features) - list(APPEND QtNetwork_DROPPED_ENTRIES QDtls) + list(APPEND QtNetwork_DROPPED_ENTRIES QDtls QDtlsClientVerifier) message(STATUS "Qt${QT_MAJOR_VERSION}Network: Dropping DTLS classes") else() list(APPEND QtNetwork_SRC - ${QtNetwork_GEN_DIR}/qdtls_wrapper.cpp) + ${QtNetwork_GEN_DIR}/qdtls_wrapper.cpp + ${QtNetwork_GEN_DIR}/qdtlsclientverifier_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 4235bf7cc..a5afafbd3 100644 --- a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml +++ b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml @@ -101,6 +101,7 @@ <object-type name="QDtls" since="5.12"> <enum-type name="HandshakeState"/> </object-type> + <object-type name="QDtlsClientVerifier"/> <value-type name="QHstsPolicy" since="5.9"> <enum-type name="PolicyFlag" flags="PolicyFlags"/> diff --git a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml index 2a14ebbe2..4b7825217 100644 --- a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml +++ b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml @@ -132,6 +132,8 @@ <enum-type name="Flag" flags="Flags"/> </object-type> <object-type name="QSGMaterialShader"> + <enum-type name="Stage"/> + <enum-type name="Flag" flags="Flags"/> <value-type name="RenderState"> <enum-type name="DirtyState" flags="DirtyStates"/> </value-type> |