Skip to content

Commit c086a0d

Browse files
usiemsusiems
committed
Adjustments for new stuff in Qt 6.8
1 parent 68919b2 commit c086a0d

File tree

6 files changed

+55
-6
lines changed

6 files changed

+55
-6
lines changed

‎generator/typesystem_core.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,22 @@
164164
<rejection class="underlying_type"/>
165165
<rejection class="vector"/>
166166

167+
<rejection class="ArgResolver"/>
168+
<rejection class="ArgsType"/>
169+
<rejection class="AsyncContinuation"/>
170+
<rejection class="CanceledHandler"/>
171+
<rejection class="Continuation"/>
172+
<rejection class="ContinuationWrapper"/>
173+
<rejection class="FailureHandler"/>
174+
<rejection class="Future"/>
175+
<rejection class="QHashHeterogeneousSearch"/>
176+
<rejection class="QPromise"/>
177+
<rejection class="QRunnable::QGenericRunnable"/>
178+
<rejection class="QVersionNumber::It"/>
179+
<rejection class="ResultTypeHelper"/>
180+
<rejection class="SyncContinuation"/>
181+
<rejection class="UnwrapHandler"/>
182+
167183
<primitive-type name="qgl_GLsizeiptr"/>
168184
<primitive-type name="qgl_GLintptr"/>
169185
<primitive-type name="GLint"/>
@@ -272,6 +288,7 @@
272288
<rejection class="Qt::strong_ordering"/>
273289
<rejection class="Qt::weak_ordering"/>
274290
<rejection class="Qt::partial_ordering"/>
291+
<rejection class="Qt::totally_ordered_wrapper"/>
275292

276293
<rejection class="QSharedPointer"/>
277294
<rejection class="QWeakPointer"/>
@@ -497,7 +514,7 @@
497514
<rejection class="QMapPayloadNode"/>
498515
<rejection class="QMapData"/>
499516
<rejection class="QMapIterator"/>
500-
<rejection class="QMetaType::Type"/> <!-- causes build problems because of QByteArray/QString values, should be enum class -->
517+
<rejection class="QMetaType" enum-name="Type"/> <!-- causes build problems because of QByteArray/QString values, should be enum class -->
501518
<rejection class="QMetaTypeId"/>
502519
<rejection class="QMetaAssociation"/>
503520
<rejection class="QMetaClassInfo::Data"/>
@@ -668,9 +685,14 @@
668685
<rejection class="Qt" enum-name="Initialization"/>
669686
<rejection class="Qt::Disambiguated_t"/>
670687

688+
<rejection class="QAbstractEventDispatcherV2"/> <!-- Currently not supported - can't cast to this type -->
671689
<rejection class="QAbstractEventDispatcher" function-name="filterEvent"/>
672690
<rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/>
673691

692+
<rejection class="QChronoTimer"/> <!-- std::chrono::nanoseconds arguments not supported at the moment -->
693+
<rejection class="QDirListing"/> <!-- iterator-style interface not supported -->
694+
695+
674696
<rejection class="QAbstractFileEngine" function-name="extension"/>
675697
<rejection class="QCoreApplication" function-name="compressEvent"/>
676698
<rejection class="QCoreApplication" function-name="eventFilter"/>
@@ -2306,4 +2328,6 @@ public:
23062328
<enum-type name="Qt::ChecksumType"/>
23072329
<enum-type name="Qt::SplitBehaviorFlags" flags="Qt::SplitBehavior"/>
23082330
<enum-type name="Qt::HighDpiScaleFactorRoundingPolicy"/>
2331+
<enum-type name="Qt::ContextMenuTrigger"/>
2332+
<enum-type name="Qt::TimerId"/>
23092333
</typesystem>

‎generator/typesystem_gui.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
<rejection class="QAccessible"/>
2323
<rejection class="QAccessibleActionInterface"/>
24+
<rejection class="QAccessibleAnnouncementEvent"/>
25+
<rejection class="QAccessibleAttributesInterface"/>
2426
<rejection class="QAccessibleBridge"/>
2527
<rejection class="QAccessibleHyperlinkInterface"/>
2628
<rejection class="QAccessibleImageInterface"/>
@@ -3100,6 +3102,7 @@ PyObject* constScanLine(QImage* image, int line) {
31003102
<object-type name="QPageLayout"/>
31013103
<object-type name="QPageSize"/>
31023104
<object-type name="QPdfWriter"/>
3105+
<object-type name="QPdfOutputIntent" since-version="6.8"/>
31033106
<object-type name="QRegularExpressionValidator"/>
31043107
<object-type name="QScreen"/>
31053108
<object-type name="QStyleHints"/>
@@ -3178,6 +3181,7 @@ PyObject* constScanLine(QImage* image, int line) {
31783181
<enum-type name="QPageLayout::Unit"/>
31793182
<enum-type name="QPageLayout::Mode"/>
31803183
<enum-type name="QPageLayout::Orientation"/>
3184+
<enum-type name="QPageLayout::OutOfBoundsPolicy" since-version="6.8"/>
31813185
<enum-type name="QOpenGLFramebufferObject::Attachment"/>
31823186
<enum-type name="QOpenGLShader::ShaderTypeBit" flags="QOpenGLShader::ShaderType"/>
31833187
<enum-type name="QWindow::Visibility"/>

‎generator/typesystem_multimedia.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
<namespace-type name="QMultimedia" since-version="5"/>
9292

9393
<object-type name="QAbstractVideoBuffer"/>
94+
<object-type name="QAbstractVideoBuffer::MapData"/>
9495
<object-type name="QAbstractVideoSurface"/>
9596
<object-type name="QAudioBuffer"/>
9697
<object-type name="QAudioDecoder"/>
@@ -219,6 +220,10 @@
219220
<enum-type name="QVideoFrameFormat::ColorTransfer"/>
220221
<object-type name="QVideoSink"/>
221222
<object-type name="QWindowCapture" since-version="6.6"/>
223+
<object-type name="QAudioBufferInput" since-version="6.8"/>
224+
<object-type name="QAudioBufferOutput" since-version="6.8"/>
225+
<object-type name="QVideoFrameInput" since-version="6.8"/>
226+
<object-type name="QVideoFrameInput" since-version="6.8"/>
222227
</group>
223228

224229
</typesystem>

‎generator/typesystem_network.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@
171171
</value-type>
172172
<value-type name="QHttpHeaders" since-version="6.7"/>
173173
<enum-type name="QHttpHeaders::WellKnownHeader" since-version="6.7"/>
174-
<!-- preliminary in 6.7
175-
<value-type name="QNetworkRequestFactory" since-version="6.7"/>
176-
<value-type name="QRestAccessManager" since-version="6.7"/>
177-
<value-type name="QRestReply" since-version="6.7"/>
178-
-->
174+
<!-- preliminary in 6.7: -->
175+
<value-type name="QNetworkRequestFactory" since-version="6.8"/>
176+
<value-type name="QRestAccessManager" since-version="6.8"/>
177+
<value-type name="QRestReply" since-version="6.8"/>
178+
<!-- -->
179179

180180
<enum-type name="QSslError::SslError"/>
181181
<enum-type name="QSslCertificate::PatternSyntax"/>
@@ -225,6 +225,14 @@
225225
<object-type name="QDnsMailExchangeRecord"/>
226226
<object-type name="QDnsServiceRecord"/>
227227
<object-type name="QDnsTextRecord"/>
228+
<object-type name="QDnsTlsAssociationRecord" since-version="6.8"/>
229+
<enum-type name="QDnsTlsAssociationRecord::CertificateUsage"/>
230+
<enum-type name="QDnsTlsAssociationRecord::MatchingType"/>
231+
<enum-type name="QDnsTlsAssociationRecord::Selector"/>
232+
233+
<object-type name="QFormDataBuilder" since-version="6.8"/>
234+
<enum-type name="QFormDataBuilder::Option" since-version="6.8"/>
235+
<object-type name="QFormDataPartBuilder" since-version="6.8"/>
228236

229237
<enum-type name="QHostAddress::ConversionModeFlag"/>
230238
<enum-type name="QNetworkInterface::InterfaceType"/>

‎generator/typesystem_quick.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<object-type name="QQuickRenderTarget" since-version="6"/>
4242
<!-- Linker error on GitHub CI (Windows, Qt 6.5): -->
4343
<rejection class="QQuickRenderTarget" function-name="fromVulkanImage" since-version="6"/>
44+
<enum-type name="QQuickRenderTarget::Flag" since-version="6.8"/>
4445

4546
<object-type name="QSGAbstractRenderer"></object-type>
4647
<object-type name="QSGBasicGeometryNode"></object-type>

‎generator/typesystem_webenginewidgets.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,15 @@
8484
<enum-type name="QWebEngineSettings::FontSize"/>
8585
<enum-type name="QWebEngineSettings::UnknownUrlSchemePolicy" since-version="5.11"/>
8686
<enum-type name="QWebEngineSettings::WebAttribute"/>
87+
<enum-type name="QWebEngineSettings::ImageAnimationPolicy" since-version="6.8"/>
8788
<enum-type name="QWebEngineUrlRequestInfo::NavigationType"/>
8889
<enum-type name="QWebEngineUrlRequestInfo::ResourceType"/>
8990
<enum-type name="QWebEngineUrlRequestJob::Error"/>
9091

92+
<object-type name="QWebEngineClientHints" since-version="6.8"/>
93+
<rejection class="QWebEngineClientHints" enum-name="QmlIsUncreatable" since-version="6.8"/>
94+
<object-type name="QWebEngineFrame" since-version="6.8"/>
95+
<object-type name="QWebEnginePermission" since-version="6.8"/>
96+
<enum-type name="QWebEnginePermission::PermissionType" since-version="6.8"/>
97+
<enum-type name="QWebEnginePermission::State" since-version="6.8"/>
9198
</typesystem>

0 commit comments

Comments
 (0)