diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-14 10:47:40 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-29 16:43:56 +0200 |
| commit | f83d2918af03f415955076060caed411ca210470 (patch) | |
| tree | 8cbbc0f81b5f00bb18e1c326989fbb2a53ce3edd | |
| parent | 1d049c1d55d3ef107bb8625532fc4e33fe3028d3 (diff) | |
PySide6: Adapt to API changes of Qt 6.2 Beta 2
- Adapt QCalendar to qtbase/3431104f4571f9ef3185e04f92078e96a3a6aa67.
- Remove enumeration QNetworkInformation::TriState
(QtNetwork: qtbase/14b74af0608dc833f836acac4ee93f905b449806)
- Adapt to Multimedia
Change-Id: I4854d471e9ac65507e8962be59016b39eaf0a429
Reviewed-by: Christian Tismer <tismer@stackless.com>
4 files changed, 2 insertions, 6 deletions
diff --git a/sources/pyside6/PySide6/QtCore/CMakeLists.txt b/sources/pyside6/PySide6/QtCore/CMakeLists.txt index eaacd8a5a..00ed9a62c 100644 --- a/sources/pyside6/PySide6/QtCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtCore/CMakeLists.txt @@ -28,6 +28,7 @@ ${QtCore_GEN_DIR}/qbytearray_frombase64result_wrapper.cpp ${QtCore_GEN_DIR}/qbytearray_wrapper.cpp ${QtCore_GEN_DIR}/qbytearraymatcher_wrapper.cpp ${QtCore_GEN_DIR}/qcalendar_wrapper.cpp +${QtCore_GEN_DIR}/qcalendar_systemid_wrapper.cpp ${QtCore_GEN_DIR}/qcalendar_yearmonthday_wrapper.cpp ${QtCore_GEN_DIR}/qcborarray_wrapper.cpp ${QtCore_GEN_DIR}/qcborerror_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 6ba5ccd49..89308be57 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -818,10 +818,7 @@ <object-type name="QBasicTimer"/> <value-type name="QByteArrayMatcher"/> <value-type name="QCalendar" since="5.14"> - <!-- Avoid clashes between size_t/enum System --> - <modify-function signature="QCalendar(QCalendar::System)" overload-number="0"/> - <modify-function signature="QCalendar(QStringView)" overload-number="1"/> - <modify-function signature="QCalendar(size_t)" overload-number="2"/> + <object-type name="SystemId"/> <!-- not default-constructible --> <value-type name="YearMonthDay"/> <enum-type name="System"/> </value-type> diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index 2e269bbd8..b4b4271bd 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -139,7 +139,6 @@ <enum-type name="EncodingMode" since="6.1"/> <enum-type name="RecorderState" since="6.1"/> <enum-type name="Quality" since="6.1"/> - <enum-type name="Status" since="6.1"/> </object-type> <value-type name="QMediaTimeRange"> <value-type name="Interval"/> diff --git a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml index 0d0c480d6..51a3cbed8 100644 --- a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml +++ b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml @@ -203,7 +203,6 @@ <object-type name="QNetworkInformation"> <enum-type name="Reachability"/> <enum-type name="Feature" flags="Features"/> - <enum-type name="TriState" since="6.2"/> </object-type> <object-type name="QNetworkCookieJar"/> <value-type name="QNetworkDatagram" since="5.8"/> |