aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sources/pyside6/PySide6/QtCore/CMakeLists.txt1
-rw-r--r--sources/pyside6/PySide6/QtCore/typesystem_core_common.xml5
-rw-r--r--sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml1
-rw-r--r--sources/pyside6/PySide6/QtNetwork/typesystem_network.xml1
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"/>