Skip to content

Commit 467d3c0

Browse files
usiemsmrbean-bremen
usiems
authored and
mrbean-bremen
committed
Add missing classes
(and in some cases document when classes were introduced)
1 parent 2d72bc5 commit 467d3c0

File tree

7 files changed

+80
-8
lines changed

7 files changed

+80
-8
lines changed

‎generator/typesystem_core.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,14 @@
864864
<!--### Obsolete in 4.3-->
865865
</value-type>
866866

867+
<value-type name="QCalendar" since-version="5.14">
868+
<inject-code class="pywrap-h">
869+
public:
870+
const static int Unspecified = QCalendar::Unspecified;
871+
</inject-code>
872+
</value-type>
873+
<value-type name="QCalendar::YearMonthDay" since-version="5.14"/>
874+
867875
<value-type name="QDateTime">
868876
<modify-function signature="operator=(QDateTime)" remove="all"/>
869877
</value-type>
@@ -1011,6 +1019,8 @@
10111019
</modify-argument>
10121020
</modify-function>
10131021
</object-type>
1022+
<value-type name="QModelRoleData" since-version="6"/>
1023+
<value-type name="QModelRoleDataSpan" since-version="6"/>
10141024

10151025
<object-type name="QAbstractListModel">
10161026
<extra-includes>
@@ -1316,7 +1326,7 @@
13161326
</object-type>
13171327
<object-type name="QLibraryInfo"/>
13181328
<object-type name="QMutex"/>
1319-
<object-type name="QRecursiveMutex"/>
1329+
<object-type name="QRecursiveMutex" since-version="5.14"/>
13201330
<!-- QMutexLocker is a template in Qt6, we need to figure out what to do with it... -->
13211331
<value-type name="QMutexLocker" before-version="6">
13221332
<!-- special handling for context handlers -->
@@ -1432,6 +1442,10 @@
14321442
<modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/>
14331443
<!--### Obsolete in 4.3-->
14341444
</object-type>
1445+
<!-- Only available on Linux:
1446+
<enum-type name="QProcess::UnixProcessFlag" flags="QProcess::UnixProcessFlags" since-version="6.6"/>
1447+
<value-type name="QProcess::UnixProcessParameters" since-version="6.6"/>
1448+
-->
14351449

14361450
<object-type name="QSignalMapper">
14371451
</object-type>
@@ -2006,6 +2020,7 @@
20062020
<enum-type name="QTimeZone::Initialization" since-version="6.5"/>
20072021
<enum-type name="QProcess::InputChannelMode"/>
20082022
<enum-type name="QByteArray::Base64Option" flags="QByteArray::Base64Options"/>
2023+
<enum-type name="QByteArray::Base64DecodingStatus"/>
20092024
<enum-type name="QMetaType::Type"/>
20102025
<enum-type name="QMetaType::TypeFlag" flags="QMetaType::TypeFlags"/>
20112026
<enum-type name="QAbstractItemModel::CheckIndexOption"/>
@@ -2047,4 +2062,6 @@
20472062
<enum-type name="QLocale::FloatingPointPrecisionOption"/>
20482063
<enum-type name="QUuid::StringFormat"/>
20492064
<enum-type name="Qt::ChecksumType"/>
2065+
<enum-type name="Qt::SplitBehaviorFlags" flag="Qt::SplitBehavior"/>
2066+
<enum-type name="Qt::HighDpiScaleFactorRoundingPolicy"/>
20502067
</typesystem>

‎generator/typesystem_gui.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@
451451
<enum-type name="QTextDocument::FindFlag" flags="QTextDocument::FindFlags"/>
452452
<enum-type name="QTextDocument::MetaInformation"/>
453453
<enum-type name="QTextDocument::ResourceType"/>
454+
<enum-type name="QTextDocument::MarkdownFeature" flags="QTextDocument::MarkdownFeatures"/>
454455
<enum-type name="QTextEdit::AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/>
455456
<enum-type name="QTextEdit::LineWrapMode"/>
456457
<enum-type name="QTextFormat::ObjectTypes"/>
@@ -525,8 +526,8 @@
525526
</enum-type>
526527

527528

528-
<enum-type name="QMessageBox::StandardButton" flags="QMessageBox::StandardButtons">
529-
</enum-type>
529+
<enum-type name="QMessageBox::StandardButton" flags="QMessageBox::StandardButtons"/>
530+
<enum-type name="QMessageBox::Option" flags="QMessageBox::Options"/>
530531

531532
<enum-type name="QPalette::ColorGroup">
532533
</enum-type>
@@ -730,6 +731,7 @@
730731
<modify-function signature="operator int()const" access="private"/>
731732
<modify-function signature="operator[](uint)const" access="private"/>
732733
</value-type>
734+
<value-type name="QKeyCombination" since-version="6"/>
733735

734736
<value-type name="QPicture">
735737
<modify-function signature="operator=(QPicture)" remove="all"/>
@@ -771,6 +773,7 @@
771773
<modify-function signature="operator=(QTextBlock)" remove="all"/>
772774
</value-type>
773775
<value-type name="QTextBlockFormat"/>
776+
<enum-type name="QTextBlockFormat::MarkerType"/>
774777
<value-type name="QTextTableCellFormat"/>
775778
<value-type name="QTextCharFormat">
776779
<modify-function signature="isValid()const" access="non-final"/>
@@ -2525,6 +2528,7 @@ PyObject* constScanLine(QImage* image, int line) {
25252528
</modify-argument>
25262529
</modify-function>
25272530
</object-type>
2531+
<enum-type name="QTextLayout::GlyphRunRetrievalFlag" flags="QTextLayout::GlyphRunRetrievalFlags" since-version="6.5"/>
25282532

25292533
<object-type name="QTableWidget">
25302534

@@ -3092,6 +3096,7 @@ PyObject* constScanLine(QImage* image, int line) {
30923096
<interface-type name="QPagedPaintDevice" create-shell="no">
30933097
<modify-function signature="devicePageLayout()const" remove="all"/>
30943098
</interface-type>
3099+
<interface-type name="QPageRanges"/>
30953100

30963101
<interface-type name="QPlatformSurface"/>
30973102
<interface-type name="QSurface"/>
@@ -3112,6 +3117,9 @@ PyObject* constScanLine(QImage* image, int line) {
31123117
<value-type name="QRgba64">
31133118
<modify-function signature="operator quint64() const" remove="all"/>
31143119
</value-type>
3120+
<!-- template class
3121+
<value-type name="QRgbaFloat" since-version="6.2"/>
3122+
-->
31153123

31163124
<enum-type name="QScrollerProperties::ScrollMetric"/>
31173125
<enum-type name="QScrollerProperties::OvershootPolicy"/>
@@ -3171,6 +3179,14 @@ PyObject* constScanLine(QImage* image, int line) {
31713179

31723180
<object-type name="QOpenGLTextureBlitter"/>
31733181
<enum-type name="QOpenGLTextureBlitter::Origin"/>
3182+
3183+
<object-type name="QTransposeProxyModel" since-version="5.13"/>
3184+
3185+
<value-type name="QColorSpace" since-version="5.14"/>
3186+
<enum-type name="QColorSpace::NamedColorSpace" since-version="5.14"/>
3187+
<enum-type name="QColorSpace::Primaries" since-version="5.14"/>
3188+
<enum-type name="QColorSpace::TransferFunction" since-version="5.14"/>
3189+
<value-type name="QColorTransform" since-version="5.14"/>
31743190

31753191
<!-- Inefficient hash codes -->
31763192
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>

‎generator/typesystem_multimedia.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,14 @@
193193
<object-type name="QAudioSource"/>
194194
<object-type name="QCameraDevice"/>
195195
<object-type name="QCameraFormat"/>
196-
<object-type name="QCapturableWindow"/>
196+
<object-type name="QCapturableWindow" since-version="6.6"/>
197197
<object-type name="QImageCapture"/>
198198
<object-type name="QMediaCaptureSession"/>
199199
<object-type name="QMediaDevices"/>
200200
<object-type name="QMediaFormat"/>
201201
<enum-type name="QMediaFormat::ResolveFlags"/>
202202
<object-type name="QMediaTimeRange::Interval"/>
203-
<object-type name="QScreenCapture"/>
203+
<object-type name="QScreenCapture" since-version="6.5"/>
204204
<object-type name="QVideoFrameFormat"/>
205205
<enum-type name="QVideoFrameFormat::ColorSpace"/>
206206
<enum-type name="QVideoFrameFormat::ColorRange"/>
@@ -209,7 +209,7 @@
209209
<enum-type name="QVideoFrameFormat::PixelFormat"/>
210210
<enum-type name="QVideoFrameFormat::ColorTransfer"/>
211211
<object-type name="QVideoSink"/>
212-
<object-type name="QWindowCapture"/>
212+
<object-type name="QWindowCapture" since-version="6.6"/>
213213
</group>
214214

215215
</typesystem>

‎generator/typesystem_network.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,15 @@
8181
<object-type name="QHttp">
8282
<modify-function signature="closeConnection()" remove="all"/>
8383
</object-type>
84+
8485
<object-type name="QTcpServer">
8586
<modify-function signature="waitForNewConnection(int,bool*)">
8687
<modify-argument index="2">
8788
<remove-argument/>
8889
</modify-argument>
8990
</modify-function>
9091
</object-type>
92+
<object-type name="QSslServer" since-version="6.4"/>
9193
<object-type name="QTcpSocket"/>
9294
<object-type name="QUdpSocket">
9395
<modify-function signature="writeDatagram(const char*,qint64,QHostAddress,unsigned short)" remove="all"/>
@@ -230,6 +232,16 @@
230232
<object-type name="QHstsPolicy"/>
231233
<enum-type name="QHstsPolicy::PolicyFlag"/>
232234
<object-type name="QNetworkDatagram"/>
235+
236+
<object-type name="QDtls" since-version="5.12"/>
237+
<enum-type name="QDtls::HandshakeState" since-version="5.12"/>
238+
<object-type name="QDtlsClientVerifier" since-version="5.12"/>
239+
240+
<object-type name="QHttp1Configuration" since-version="6.5"/>
241+
<object-type name="QHttp2Configuration" since-version="5.14"/>
242+
243+
<object-type name="QNetworkInformation" since-version="6.1"/>
244+
<enum-type name="QNetworkInformation::Feature" flags="QNetworkInformation::Features" since-version="6.1"/>
233245

234246
<suppress-warning text="*unmatched parameter type 'sockaddr const*"/>
235247
<suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>

‎generator/typesystem_qml.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,22 @@
1010
<object-type name="QJSEngine">
1111
<modify-function signature="newQMetaObject()" remove="all"/>
1212
</object-type>
13-
<object-type name="QJSValue"></object-type>
13+
<object-type name="QJSValue"/>
14+
<object-type name="QJSManagedValue" since-version="6.1"/>
15+
<object-type name="QJSPrimitiveValue" since-version="6.1">
16+
<modify-function signature="operator++(int)" remove="all"/>
17+
<modify-function signature="operator--(int)" remove="all"/>
18+
</object-type>
19+
<object-type name="QJSPrimitiveUndefined" since-version="6.1"/>
20+
<object-type name="QJSPrimitiveNull" since-version="6.1"/>
1421

1522
<enum-type name="QJSEngine::Extension"/>
23+
<enum-type name="QJSEngine::ObjectOwnership"/>
1624
<enum-type name="QJSValue::ErrorType"/>
1725
<enum-type name="QJSValue::SpecialValue"/>
26+
<enum-type name="QJSValue::ObjectConversionBehavior"/>
27+
<enum-type name="QJSManagedValue::Type" since-version="6.1"/>
28+
<enum-type name="QJSPrimitiveValue::Type" since-version="6.1"/>
1829

1930
<object-type name="QQmlAbstractUrlInterceptor"></object-type>
2031
<object-type name="QQmlApplicationEngine"></object-type>

‎generator/typesystem_webenginewidgets.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<object-type name="QWebEngineFullScreenRequest"/>
1313
<object-type name="QWebEngineHistory"/>
1414
<object-type name="QWebEngineHistoryItem"/>
15-
<object-type name="QWebEngineHistoryModel" since-version="6.2"/>
15+
<interface-type name="QWebEngineHistoryModel" create-shell="no" create-promoter="no" since-version="6.2"/>
1616
<enum-type name="QWebEngineHistoryModel::Roles" since-version="6.2"/>
1717
<object-type name="QWebEngineProfile"/>
1818
<object-type name="QWebEngineScript"/>
@@ -22,6 +22,21 @@
2222
<object-type name="QWebEngineUrlRequestInterceptor"/>
2323
<object-type name="QWebEngineUrlRequestJob"/>
2424
<object-type name="QWebEngineUrlSchemeHandler"/>
25+
<object-type name="QWebEngineNotification" since-version="5.13"/>
26+
<object-type name="QWebEngineClientCertificateStore" since-version="5.13"/>
27+
<object-type name="QWebEngineLoadingInfo" since-version="6.2"/>
28+
<enum-type name="QWebEngineLoadingInfo::ErrorDomain" since-version="6.2"/>
29+
<enum-type name="QWebEngineLoadingInfo::LoadStatus" since-version="6.2"/>
30+
<object-type name="QWebEngineContextMenuRequest" since-version="6.2"/>
31+
<enum-type name="QWebEngineContextMenuRequest::EditFlag" flags="QWebEngineContextMenuRequest::EditFlags" since-version="6.2"/>
32+
<enum-type name="QWebEngineContextMenuRequest::MediaFlag" flags="QWebEngineContextMenuRequest::MediaFlags" since-version="6.2"/>
33+
<enum-type name="QWebEngineContextMenuRequest::MediaType" since-version="6.2"/>
34+
<object-type name="QWebEngineNavigationRequest" since-version="6.2"/>
35+
<object-type name="QWebEngineNewWindowRequest" since-version="6.2"/>
36+
<enum-type name="QWebEngineNewWindowRequest::DestinationType" since-version="6.2"/>
37+
<object-type name="QWebEngineFileSystemAccessRequest" since-version="6.4"/>
38+
<enum-type name="QWebEngineFileSystemAccessRequest::AccessFlag" flags="QWebEngineFileSystemAccessRequest::AccessFlags" since-version="6.4"/>
39+
<enum-type name="QWebEngineFileSystemAccessRequest::HandleType" since-version="6.4"/>
2540

2641
<enum-type name="QWebEngineCertificateError::Error"/>
2742
<enum-type name="QWebEngineDownloadItem::DownloadState"/>

‎generator/typesystem_xml.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<modify-function signature="operator=(QDomDocument)" remove="all"/>
3737
</value-type>
3838
<enum-type name="QDomDocument::ParseOption" flags="QDomDocument::ParseOptions" since-version="6.5"/>
39+
<value-type name="QDomDocument::ParseResult" since-version="6.5"/>
3940

4041
<value-type name="QDomDocumentFragment">
4142
<modify-function signature="nodeType()const" remove="all"/>

0 commit comments

Comments
 (0)