Skip to content

Commit bf1219a

Browse files
usiemsusiems
committed
Handle new classes and enums in Qt 6.7
1 parent ecd5ea6 commit bf1219a

File tree

7 files changed

+59
-2
lines changed

7 files changed

+59
-2
lines changed

‎generator/typesystem_core.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<rejection class="QAtomicOps"/>
3434
<rejection class="QAtomicOpsSupport"/>
3535
<rejection class="QAtomicOpsSupport>"/>
36+
<rejection class="QAtomicScopedValueRollback" since-version="6.7"/>
3637
<rejection class="QAtomicTraits"/>
3738
<rejection class="QBaseIterator"/>
3839
<rejection class="QBasicAtomicInteger"/>
@@ -78,12 +79,14 @@
7879
<rejection class="QScopedPointerObjectDeleteLater"/>
7980
<rejection class="QScopedValueRollback"/>
8081
<rejection class="QSequentialIterable"/>
82+
<rejection class="QSpan"/>
8183

8284
<rejection class="QStaticArrayData"/>
8385
<rejection class="QStaticAssertFailure"/>
8486
<rejection class="QStaticByteArrayData"/>
8587
<rejection class="QStaticPlugin"/>
8688
<rejection class="QStaticStringData"/>
89+
<rejection class="QStaticLatin1StringMatcher"/>
8790
<rejection class="QStringBuilderBase"/>
8891
<rejection class="QStringBuilderCommon"/>
8992
<rejection class="QStringDataPtr"/>
@@ -265,6 +268,11 @@
265268
<rejection class="Qt" function-name="qt_getEnumName"/>
266269
<rejection class="Qt" function-name="qt_getEnumMetaObject"/>
267270

271+
<!-- new Qt ordering regime (since 6.7) -->
272+
<rejection class="Qt::strong_ordering"/>
273+
<rejection class="Qt::weak_ordering"/>
274+
<rejection class="Qt::partial_ordering"/>
275+
268276
<rejection class="QSharedPointer"/>
269277
<rejection class="QWeakPointer"/>
270278
<rejection class="QFuture::const_iterator"/>
@@ -990,6 +998,7 @@ public:
990998
<modify-function signature="operator=(QDateTime)" remove="all"/>
991999
</value-type>
9921000
<enum-type name="QDateTime::YearRange"/>
1001+
<enum-type name="QDateTime::TransitionResolution" since-version="6.7"/>
9931002

9941003
<value-type name="QDir">
9951004
<modify-function signature="QDir(QString,QString,QFlags&lt;QDir::SortFlag&gt;,QFlags&lt;QDir::Filter&gt;)">
@@ -1466,6 +1475,7 @@ public:
14661475
</object-type>
14671476
<object-type name="QLibraryInfo"/>
14681477
<value-type name="QVersionNumber"/>
1478+
<rejection class="QVersionNumber::SegmentStorage" since-version="6.7"/>
14691479
<object-type name="QMutex"/>
14701480
<object-type name="QRecursiveMutex" since-version="5.14"/>
14711481
<value-type name="QMutexLocker" before-version="6">
@@ -2021,6 +2031,8 @@ public:
20212031
}
20222032
</inject-code>
20232033
</object-type>
2034+
<rejection class="QCborStreamReader::StringResult" since-version="6.7"/>
2035+
20242036
<object-type name="QCborValue" since-version="5.12">
20252037
<modify-function signature="QCborValue(QCborTag, const QCborValue&amp;)" remove="all"/>
20262038
<modify-function signature="tag(QCborTag)const" remove="all"/>

‎generator/typesystem_gui.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,9 @@
169169
<rejection class="QGradient" function-name="interpolationMode"/>
170170
<rejection class="QAbstractTextDocumentLayout" function-name="handlerForObject"/>
171171
<rejection class="QPixmap" function-name="fromImageInPlace"/>
172-
172+
173+
<rejection class="QRhiWidget" since-version="6.7"/> <!-- rest of QRhi API currently not available -->
174+
173175
<enum-type name="QStaticText::PerformanceHint"/>
174176
<enum-type name="QTextBlockFormat::LineHeightTypes"/>
175177
<enum-type name="QStyleOptionTabWidgetFrameV2::StyleOptionVersion"/>
@@ -291,6 +293,7 @@
291293
<enum-type name="QGraphicsView::ViewportUpdateMode"/>
292294
<enum-type name="QIcon::Mode"/>
293295
<enum-type name="QIcon::State"/>
296+
<enum-type name="QIcon::ThemeIcon" since-version="6.7"/>
294297
<enum-type name="QImage::Format"/>
295298
<enum-type name="QImage::InvertMode"/>
296299
<enum-type name="QImageIOHandler::ImageOption"/>
@@ -954,6 +957,25 @@
954957
<modify-function signature="operator=(QFont)" remove="all"/>
955958
</value-type>
956959

960+
<value-type name="QFont::Tag" since-version="6.7">
961+
<inject-code class="pywrap-h">
962+
// a little bit complicated, since we currently dont't support std::optional:
963+
QFont::Tag static_QFont__Tag_fromString(const QString&amp; name) {
964+
return QFont::Tag::fromString(name).value_or(QFont::Tag());
965+
}
966+
QFont::Tag static_QFont__Tag_fromValue(unsigned int key) {
967+
return QFont::Tag::fromValue(key).value_or(QFont::Tag());
968+
}
969+
// basically the same as above:
970+
QFont::Tag* new_QFont__Tag(const QString&amp; name) {
971+
return new QFont::Tag(static_QFont__Tag_fromString(name));
972+
}
973+
QFont::Tag* new_QFont__Tag(unsigned int key) {
974+
return new QFont::Tag(static_QFont__Tag_fromValue(key));
975+
}
976+
</inject-code>
977+
</value-type>
978+
957979
<value-type name="QTextTableCell">
958980
<extra-includes>
959981
<include file-name="QTextCursor" location="global"/>
@@ -1696,6 +1718,8 @@ PyObject* constScanLine(QImage* image, int line) {
16961718
<object-type name="QPaintEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Paint"/>
16971719
<object-type name="QAccessibleEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::AccessibilityDescription || %1-&gt;type() == QEvent::AccessibilityHelp"/>
16981720

1721+
<object-type name="QChildWindowEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ChildWindowAdded || %1-&gt;type() == QEvent::ChildWindowRemoved" since-version="6.7"/>
1722+
16991723
<object-type name="QAbstractButton"/>
17001724

17011725
<object-type name="QStyle" create-shell="no">

‎generator/typesystem_network.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,13 @@
169169
<value-type name="QNetworkRequest">
170170
<modify-function signature="operator=(QNetworkRequest)" remove="all"/>
171171
</value-type>
172+
<value-type name="QHttpHeaders" since-version="6.7"/>
173+
<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+
-->
172179

173180
<enum-type name="QSslError::SslError"/>
174181
<enum-type name="QSslCertificate::PatternSyntax"/>

‎generator/typesystem_qml.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<rejection class="QQmlTypeNotAvailable"/>
1515
<rejection class="QmlTypeAndRevisionsRegistration"/>
1616
<rejection enum-name="QQmlModuleImportSpecialVersions"/>
17+
<rejection class="QJSList" since-version="6.7"/>
18+
<rejection class="QJSListForInIterator" since-version="6.7"/>
19+
<rejection class="QJSListForOfIterator" since-version="6.7"/>
1720

1821
<object-type name="QJSEngine">
1922
<modify-function signature="newQMetaObject()" remove="all"/>

‎generator/typesystem_quick.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<rejection class="QQuickImageResponse"/>
1919
<rejection class="QQuickAsyncImageProvider"/>
2020
<!-- end -->
21+
<rejection class="QQuickRhiItem" since-version="6.7"/> <!-- rest of QRhi API currently not available -->
22+
<rejection class="QQuickRhiItemRenderer" since-version="6.7"/> <!-- rest of QRhi API currently not available -->
2123

2224
<object-type name="QQuickAsyncImageProvider"></object-type>
2325
<object-type name="QQuickFramebufferObject"></object-type>
@@ -57,6 +59,9 @@
5759
<object-type name="QSGTextureMaterial"></object-type>
5860
<object-type name="QSGTextureProvider"></object-type>
5961
<object-type name="QSGTransformNode"></object-type>
62+
<object-type name="QSGTextNode" create-shell="no" since-version="6.7"/>
63+
<enum-type name="QSGTextNode::RenderType" since-version="6.7"/>
64+
<enum-type name="QSGTextNode::TextStyle" since-version="6.7"/>
6065

6166
<object-type name="QSGGeometry::Attribute"></object-type>
6267
<object-type name="QSGGeometry::AttributeSet"></object-type>

‎generator/typesystem_sql.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@
115115
<modify-function signature="virtual_hook(int,void*)">
116116
<remove/>
117117
</modify-function>
118-
118+
<modify-function signature="boundValues(Qt::Disambiguated_t)">
119+
<remove/>
120+
</modify-function>
119121
</object-type>
120122
<object-type name="QSqlTableModel">
121123
<extra-includes>

‎generator/typesystem_webenginewidgets.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
<object-type name="QWebEngineQuotaRequest" since-version="5.11"/>
5757
<object-type name="QWebEngineRegisterProtocolHandlerRequest" since-version="5.11"/>
5858

59+
<object-type name="QWebEngineDesktopMediaRequest" since-version="6.7"/>
60+
<object-type name="QWebEngineWebAuthPinRequest" since-version="6.7"/>
61+
<object-type name="QWebEngineWebAuthUxRequest" since-version="6.7"/>
62+
5963
<enum-type name="QWebEngineCertificateError::Error"/>
6064
<enum-type name="QWebEngineDownloadItem::DownloadState"/>
6165
<enum-type name="QWebEnginePage::Feature"/>

0 commit comments

Comments
 (0)