Skip to content

Commit d0e46f4

Browse files
usiemsjcfr
usiems
authored and
jcfr
committed
[Backport generator] More typesystem entries (added classes and rejections)
Just so that there are no unknown rejected classes and enums in the log file for Qt 6.6. The support for some of the new classes might be incomplete. (cherry picked from commit MeVisLab/pythonqt@249e092)
1 parent b58e3b0 commit d0e46f4

8 files changed

+284
-15
lines changed

‎generator/typesystem_core.xml

Lines changed: 207 additions & 2 deletions
Large diffs are not rendered by default.

‎generator/typesystem_gui.xml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222
<rejection class="QAccessible"/>
2323
<rejection class="QAccessibleActionInterface"/>
2424
<rejection class="QAccessibleBridge"/>
25+
<rejection class="QAccessibleHyperlinkInterface"/>
2526
<rejection class="QAccessibleImageInterface"/>
2627
<rejection class="QAccessibleInterface"/>
2728
<rejection class="QAccessibleObject"/>
2829
<rejection class="QAccessiblePlugin"/>
2930
<rejection class="QAccessibleStateChangeEvent"/>
31+
<rejection class="QAccessibleSelectionInterface"/>
3032
<rejection class="QAccessibleTableCellInterface"/>
3133
<rejection class="QAccessibleTableInterface"/>
3234
<rejection class="QAccessibleTableModelChangeEvent"/>
@@ -84,6 +86,7 @@
8486
<rejection class="QAbstractUndoItem"/>
8587
<rejection class="QAccessibleApplication"/>
8688
<rejection class="QBrushData"/>
89+
<rejection class="QBrushDataPointerDeleter"/>
8790
<rejection class="QImageTextKeyLang"/>
8891
<rejection class="QItemEditorCreator"/>
8992
<rejection class="QLinkedList"/>
@@ -104,6 +107,7 @@
104107
<rejection class="QWindowSurface"/>
105108
<rejection class="QWindowsXPStyle"/>
106109
<rejection class="QWindowsVistaStyle"/>
110+
<rejection class="QWindowsMimeConverter"/>
107111
<rejection class="QWSEmbedWidget"/>
108112
<rejection class="QRegion::QRegionData"/>
109113
<rejection class="JObject_key"/>
@@ -156,13 +160,15 @@
156160
<rejection class="QWidgetItem" field-name="wid"/>
157161
<rejection class="QFont" enum-name="ResolveProperties"/>
158162
<rejection class="QGradient" enum-name="InterpolationMode"/>
163+
<rejection class="QIconEngine::ScaledPixmapArgument" since-version="5.9"/>
159164
<rejection class="QIconEngineV2::AvailableSizesArgument"/>
160165
<rejection class="QIconEngineV2" enum-name="IconEngineHook"/>
166+
<rejection class="QGradient::QGradientData"/>
161167
<rejection class="QGradient" enum-name="InterpolationMode"/>
162168
<rejection class="QGradient" function-name="setInterpolationMode"/>
163169
<rejection class="QGradient" function-name="interpolationMode"/>
164170
<rejection class="QAbstractTextDocumentLayout" function-name="handlerForObject"/>
165-
<rejection class="QPixmap" function-name="fromImageInPlace"/>
171+
<rejection class="QPixmap" function-name="fromImageInPlace"/>
166172

167173
<enum-type name="QStaticText::PerformanceHint"/>
168174
<enum-type name="QTextBlockFormat::LineHeightTypes"/>
@@ -390,6 +396,8 @@
390396
<enum-type name="QStyleOptionHeader::SortIndicator"/>
391397
<enum-type name="QStyleOptionHeader::StyleOptionType"/>
392398
<enum-type name="QStyleOptionHeader::StyleOptionVersion"/>
399+
<enum-type name="QStyleOptionHeaderV2::StyleOptionType"/>
400+
<enum-type name="QStyleOptionHeaderV2::StyleOptionVersion"/>
393401
<enum-type name="QStyleOptionMenuItem::CheckType"/>
394402
<enum-type name="QStyleOptionMenuItem::MenuItemType"/>
395403
<enum-type name="QStyleOptionMenuItem::StyleOptionType"/>
@@ -615,6 +623,7 @@
615623
</modify-argument>
616624
</modify-function>
617625
</value-type>
626+
<rejection class="QTransform::Affine"/>
618627

619628
<value-type name="QStyleOption" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type == QStyleOption::SO_Default">
620629
<modify-function signature="operator=(QStyleOption)" remove="all"/>
@@ -641,6 +650,7 @@
641650

642651
<value-type name="QStyleOptionGroupBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionGroupBox::Type &amp;&amp; %1-&gt;version == QStyleOptionGroupBox::Version"/>
643652
<value-type name="QStyleOptionHeader" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version"/>
653+
<value-type name="QStyleOptionHeaderV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeaderV2::Type &amp;&amp; %1-&gt;version == QStyleOptionHeaderV2::Version"/>
644654
<value-type name="QStyleOptionMenuItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionMenuItem::Type &amp;&amp; %1-&gt;version == QStyleOptionMenuItem::Version"/>
645655
<value-type name="QStyleOptionProgressBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBar::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBar::Version"/>
646656

@@ -892,6 +902,7 @@
892902
<modify-function signature="data()const" remove="all"/>
893903
<modify-function signature="operator()(int, int)const" remove="all"/>
894904
</value-type>
905+
<rejection class="QMatrix4x4" enum-name="Flag"/>
895906
<value-type name="QMatrix">
896907
<extra-includes>
897908
<include file-name="QPainterPath" location="global"/>
@@ -1120,6 +1131,7 @@ PyObject* constScanLine(QImage* image, int line) {
11201131
<modify-function signature="dark(int)const" remove="all"/> <!--### Obsolete in 4.3-->
11211132
<modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3-->
11221133
</value-type>
1134+
<rejection class="QColor::CT"/>
11231135

11241136
<value-type name="QFontMetricsF" expense-cost="1" expense-limit="1000">
11251137
<modify-function signature="operator!=(const QFontMetricsF &amp;)">
@@ -1326,6 +1338,7 @@ PyObject* constScanLine(QImage* image, int line) {
13261338
<object-type name="QHeaderView">
13271339
</object-type>
13281340
<object-type name="QIconEngine">
1341+
<modify-function signature="virtual_hook(int,void*)" remove="all"/>
13291342
</object-type>
13301343
<object-type name="QIconEngineV2">
13311344
<modify-function signature="virtual_hook(int,void*)" remove="all"/>
@@ -2936,6 +2949,7 @@ PyObject* constScanLine(QImage* image, int line) {
29362949
</modify-argument>
29372950
</modify-function>
29382951
</object-type>
2952+
<value-type name="QFormLayout::TakeRowResult" since-version="5.8"/>
29392953

29402954
<object-type name="QGraphicsGridLayout">
29412955
<modify-function signature="addItem(QGraphicsLayoutItem*,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
@@ -3078,6 +3092,7 @@ PyObject* constScanLine(QImage* image, int line) {
30783092
<object-type name="QOpenGLTimeMonitor"/>
30793093
<object-type name="QOpenGLTimerQuery"/>
30803094
<object-type name="QOpenGLVersionProfile"/>
3095+
<object-type name="QOpenGLVersionFunctionsFactory" since-version="6"/>
30813096
<object-type name="QOpenGLVertexArrayObject"/>
30823097
<object-type name="QPageLayout"/>
30833098
<object-type name="QPageSize"/>
@@ -3096,7 +3111,8 @@ PyObject* constScanLine(QImage* image, int line) {
30963111
<interface-type name="QPagedPaintDevice" create-shell="no">
30973112
<modify-function signature="devicePageLayout()const" remove="all"/>
30983113
</interface-type>
3099-
<interface-type name="QPageRanges"/>
3114+
<interface-type name="QPageRanges" since-version="6"/>
3115+
<value-type name="QPageRanges::Range" since-version="6"/>
31003116

31013117
<interface-type name="QPlatformSurface"/>
31023118
<interface-type name="QSurface"/>
@@ -3180,6 +3196,7 @@ PyObject* constScanLine(QImage* image, int line) {
31803196
<object-type name="QOpenGLTextureBlitter"/>
31813197
<enum-type name="QOpenGLTextureBlitter::Origin"/>
31823198

3199+
<object-type name="QConcatenateTablesProxyModel" since-version="5.13"/>
31833200
<object-type name="QTransposeProxyModel" since-version="5.13"/>
31843201

31853202
<value-type name="QColorSpace" since-version="5.14"/>

‎generator/typesystem_multimedia.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<rejection class="QAudioBuffer::StereoFrame"/>
88
<rejection class="QVideoFilterRunnable"/>
99
<rejection class="QAbstractVideoFilter"/>
10+
<rejection class="QAudioFrame"/> <!-- template class -->
11+
<rejection class="QWaveDecoder"/> <!-- not documented, probably should use QAudioDecoder instead -->
1012

1113
<enum-type name="QAudioFormat::Endian"/>
1214
<enum-type name="QAudioFormat::SampleType"/>
@@ -126,11 +128,14 @@
126128
<enum-type name="QVideoFrame::HandleType"/>
127129
<enum-type name="QVideoFrame::MapMode"/>
128130
<enum-type name="QVideoFrame::RotationAngle"/>
131+
<object-type name="QVideoFrame::PaintOptions"/>
132+
<enum-type name="QVideoFrame::PaintOptions::PaintFlag" flags="QVideoFrame::PaintOptions::PaintFlags"/>
129133
</group>
130134
<object-type name="QVideoProbe"/>
131135
<object-type name="QVideoSurfaceFormat"/>
132136
<object-type name="QCameraViewfinder"/>
133137
<object-type name="QGraphicsVideoItem"/>
138+
<rejection class="QGraphicsVideoItem" enum-name="enum_1"/>
134139
<object-type name="QVideoWidget"/>
135140
<object-type name="QAbstractAudioDeviceInfo"/>
136141
<object-type name="QAbstractAudioInput"/>

‎generator/typesystem_network.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
</namespace-type>
66

77
<rejection class="QSqlError::Unused"/>
8-
<rejection class="QSslConfiguration" function-name="defaultDtlsConfiguration"/>
9-
<rejection class="QSslConfiguration" function-name="dtlsCookieVerificationEnabled"/>
10-
<rejection class="QSslConfiguration" function-name="setDefaultDtlsConfiguration"/>
11-
<rejection class="QSslConfiguration" function-name="setDtlsCookieVerificationEnabled"/>
128

139
<enum-type name="QSsl::AlertLevel" since-version="6"/>
1410
<enum-type name="QSsl::AlertType" since-version="6"/>
@@ -112,8 +108,6 @@
112108
</object-type>
113109
<object-type name="QNetworkCookieJar"/>
114110
<object-type name="QNetworkReply">
115-
<modify-function signature="setSslConfiguration(QSslConfiguration)" remove="all"/>
116-
<modify-function signature="sslConfiguration() const" remove="all"/>
117111
<modify-function signature="ignoreSslErrors(const QList&lt;QSslError&gt;&amp;)" remove="all"/>
118112
</object-type>
119113

@@ -174,8 +168,6 @@
174168
</value-type>
175169
<value-type name="QNetworkRequest">
176170
<modify-function signature="operator=(QNetworkRequest)" remove="all"/>
177-
<modify-function signature="setSslConfiguration(QSslConfiguration)" remove="all"/>
178-
<modify-function signature="sslConfiguration() const" remove="all"/>
179171
</value-type>
180172

181173
<enum-type name="QSslError::SslError"/>
@@ -193,6 +185,8 @@
193185
</extra-includes>
194186
</value-type>
195187
<value-type name="QSslConfiguration"/>
188+
<value-type name="QSslDiffieHellmanParameters" since-version="5.8"/>
189+
<enum-type name="QSslDiffieHellmanParameters::Error" since-version="5.8"/>
196190

197191
<object-type name="QSslSocket"/>
198192

@@ -236,10 +230,17 @@
236230
<object-type name="QDtls" since-version="5.12"/>
237231
<enum-type name="QDtls::HandshakeState" since-version="5.12"/>
238232
<object-type name="QDtlsClientVerifier" since-version="5.12"/>
233+
<value-type name="QDtlsClientVerifier::GeneratorParameters" since-version="5.12"/>
239234

240235
<object-type name="QHttp1Configuration" since-version="6.5"/>
236+
<rejection class="QHttp1Configuration::ShortData" since-version="6.5"/>
237+
<rejection class="QHttp1Configuration::U" since-version="6.5"/>
241238
<object-type name="QHttp2Configuration" since-version="5.14"/>
242-
239+
240+
<object-type name="QOcspResponse" since-version="5.13"/>
241+
<enum-type name="QOcspCertificateStatus" since-version="5.13"/>
242+
<enum-type name="QOcspRevocationReason" since-version="5.13"/>
243+
243244
<object-type name="QNetworkInformation" since-version="6.1"/>
244245
<enum-type name="QNetworkInformation::Feature" flags="QNetworkInformation::Features" since-version="6.1"/>
245246

‎generator/typesystem_qml.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
<rejection class="QQmlListProperty"/>
77
<rejection class="QQmlTypeInfo"/>
88
<rejection class="QQmlImageProviderBase"/>
9+
<rejection class="QQmlContext::PropertyPair"/>
10+
<rejection class="QQmlEngineExtensionInterface"/>
11+
<rejection class="QQmlEngineExtensionPlugin"/>
12+
<rejection class="QQmlModuleRegistration"/>
13+
<rejection class="QQmlTriviallyDestructibleDebuggingEnabler"/>
14+
<rejection class="QQmlTypeNotAvailable"/>
15+
<rejection class="QmlTypeAndRevisionsRegistration"/>
16+
<rejection enum-name="QQmlModuleImportSpecialVersions"/>
917

1018
<object-type name="QJSEngine">
1119
<modify-function signature="newQMetaObject()" remove="all"/>
@@ -16,6 +24,13 @@
1624
<modify-function signature="operator++(int)" remove="all"/>
1725
<modify-function signature="operator--(int)" remove="all"/>
1826
</object-type>
27+
<rejection class="QJSPrimitiveValue::AddOperators" since-version="6.1"/>
28+
<rejection class="QJSPrimitiveValue::DivOperators" since-version="6.1"/>
29+
<rejection class="QJSPrimitiveValue::MulOperators" since-version="6.1"/>
30+
<rejection class="QJSPrimitiveValue::QJSPrimitiveValuePrivate" since-version="6.1"/>
31+
<rejection class="QJSPrimitiveValue::StringNaNOperators" since-version="6.1"/>
32+
<rejection class="QJSPrimitiveValue::SubOperators" since-version="6.1"/>
33+
1934
<object-type name="QJSPrimitiveUndefined" since-version="6.1"/>
2035
<object-type name="QJSPrimitiveNull" since-version="6.1"/>
2136

‎generator/typesystem_quick.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,16 @@
2929
<object-type name="QQuickTextDocument"></object-type>
3030
<object-type name="QQuickTransform"></object-type>
3131
<object-type name="QQuickView"></object-type>
32-
<object-type name="QQuickWindow"></object-type>
32+
<object-type name="QQuickWindow"/>
33+
<object-type name="QQuickWindow::GraphicsStateInfo" since-version="5.14"/>
3334

34-
<object-type name="QQuickWidget"></object-type>
35+
<object-type name="QQuickWidget"/>
36+
37+
<object-type name="QQuickGraphicsConfiguration" since-version="6"/>
38+
<rejection class="QQuickGraphicsDevice" since-version="6"/>
39+
<object-type name="QQuickRenderTarget" since-version="6"/>
40+
<!-- Linker error on GitHub CI (Windows, Qt 6.5): -->
41+
<rejection class="QQuickRenderTarget" function-name="fromVulkanImage" since-version="6"/>
3542

3643
<object-type name="QSGAbstractRenderer"></object-type>
3744
<object-type name="QSGBasicGeometryNode"></object-type>

‎generator/typesystem_webenginewidgets.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
</object-type>
66
<object-type name="QWebEnginePage">
77
</object-type>
8+
9+
<object-type name="QWebChannel"/>
10+
<object-type name="QWebChannelAbstractTransport"/>
811

912
<object-type name="QWebEngineCertificateError"/>
1013
<object-type name="QWebEngineCookieStore"/>
14+
<value-type name="QWebEngineCookieStore::FilterRequest" since-version="5.11"/>
1115
<object-type name="QWebEngineDownloadItem"/>
1216
<object-type name="QWebEngineFullScreenRequest"/>
1317
<object-type name="QWebEngineHistory"/>
@@ -22,21 +26,35 @@
2226
<object-type name="QWebEngineUrlRequestInterceptor"/>
2327
<object-type name="QWebEngineUrlRequestJob"/>
2428
<object-type name="QWebEngineUrlSchemeHandler"/>
29+
<object-type name="QWebEngineUrlScheme" since-version="5.12"/>
30+
<enum-type name="QWebEngineUrlScheme::Flag" flags="QWebEngineUrlScheme::Flags" since-version="5.12"/>
31+
<enum-type name="QWebEngineUrlScheme::SpecialPort" since-version="5.12"/>
32+
<enum-type name="QWebEngineUrlScheme::Syntax" since-version="5.12"/>
2533
<object-type name="QWebEngineNotification" since-version="5.13"/>
34+
<object-type name="QWebEngineClientCertificateSelection" since-version="5.12"/>
2635
<object-type name="QWebEngineClientCertificateStore" since-version="5.13"/>
36+
<object-type name="QWebEngineFindTextResult" since-version="5.14"/>
2737
<object-type name="QWebEngineLoadingInfo" since-version="6.2"/>
2838
<enum-type name="QWebEngineLoadingInfo::ErrorDomain" since-version="6.2"/>
2939
<enum-type name="QWebEngineLoadingInfo::LoadStatus" since-version="6.2"/>
3040
<object-type name="QWebEngineContextMenuRequest" since-version="6.2"/>
3141
<enum-type name="QWebEngineContextMenuRequest::EditFlag" flags="QWebEngineContextMenuRequest::EditFlags" since-version="6.2"/>
3242
<enum-type name="QWebEngineContextMenuRequest::MediaFlag" flags="QWebEngineContextMenuRequest::MediaFlags" since-version="6.2"/>
3343
<enum-type name="QWebEngineContextMenuRequest::MediaType" since-version="6.2"/>
44+
<object-type name="QWebEngineDownloadRequest" since-version="6"/>
45+
<enum-type name="QWebEngineDownloadRequest::DownloadInterruptReason" since-version="6"/>
46+
<enum-type name="QWebEngineDownloadRequest::DownloadState" since-version="6"/>
47+
<enum-type name="QWebEngineDownloadRequest::SavePageFormat" since-version="6"/>
3448
<object-type name="QWebEngineNavigationRequest" since-version="6.2"/>
3549
<object-type name="QWebEngineNewWindowRequest" since-version="6.2"/>
3650
<enum-type name="QWebEngineNewWindowRequest::DestinationType" since-version="6.2"/>
3751
<object-type name="QWebEngineFileSystemAccessRequest" since-version="6.4"/>
3852
<enum-type name="QWebEngineFileSystemAccessRequest::AccessFlag" flags="QWebEngineFileSystemAccessRequest::AccessFlags" since-version="6.4"/>
3953
<enum-type name="QWebEngineFileSystemAccessRequest::HandleType" since-version="6.4"/>
54+
<object-type name="QWebEngineHttpRequest" since-version="5.9"/>
55+
<enum-type name="QWebEngineHttpRequest::Method" since-version="5.9"/>
56+
<object-type name="QWebEngineQuotaRequest" since-version="5.11"/>
57+
<object-type name="QWebEngineRegisterProtocolHandlerRequest" since-version="5.11"/>
4058

4159
<enum-type name="QWebEngineCertificateError::Error"/>
4260
<enum-type name="QWebEngineDownloadItem::DownloadState"/>

‎generator/typesystem_xml.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@
181181
<modify-function signature="QXmlStreamReader(const char*)" remove="all"/>
182182
<modify-function signature="addData(const char*)" remove="all"/>
183183
</object-type>
184+
<rejection class="QXmlStreamReader::PrivateConstructorTag"/>
184185
<object-type name="QXmlStreamWriter">
185186
<modify-function signature="QXmlStreamWriter(QString *)">
186187
<remove/>

0 commit comments

Comments
 (0)