Skip to content

Commit

Permalink
[Backport generator] More typesystem entries (added classes and rejec…
Browse files Browse the repository at this point in the history
…tions)

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)
  • Loading branch information
usiems authored and jcfr committed Jan 28, 2024
1 parent b58e3b0 commit d0e46f4
Show file tree
Hide file tree
Showing 8 changed files with 284 additions and 15 deletions.
209 changes: 207 additions & 2 deletions generator/typesystem_core.xml

Large diffs are not rendered by default.

21 changes: 19 additions & 2 deletions generator/typesystem_gui.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
<rejection class="QAccessible"/>
<rejection class="QAccessibleActionInterface"/>
<rejection class="QAccessibleBridge"/>
<rejection class="QAccessibleHyperlinkInterface"/>
<rejection class="QAccessibleImageInterface"/>
<rejection class="QAccessibleInterface"/>
<rejection class="QAccessibleObject"/>
<rejection class="QAccessiblePlugin"/>
<rejection class="QAccessibleStateChangeEvent"/>
<rejection class="QAccessibleSelectionInterface"/>
<rejection class="QAccessibleTableCellInterface"/>
<rejection class="QAccessibleTableInterface"/>
<rejection class="QAccessibleTableModelChangeEvent"/>
Expand Down Expand Up @@ -84,6 +86,7 @@
<rejection class="QAbstractUndoItem"/>
<rejection class="QAccessibleApplication"/>
<rejection class="QBrushData"/>
<rejection class="QBrushDataPointerDeleter"/>
<rejection class="QImageTextKeyLang"/>
<rejection class="QItemEditorCreator"/>
<rejection class="QLinkedList"/>
Expand All @@ -104,6 +107,7 @@
<rejection class="QWindowSurface"/>
<rejection class="QWindowsXPStyle"/>
<rejection class="QWindowsVistaStyle"/>
<rejection class="QWindowsMimeConverter"/>
<rejection class="QWSEmbedWidget"/>
<rejection class="QRegion::QRegionData"/>
<rejection class="JObject_key"/>
Expand Down Expand Up @@ -156,13 +160,15 @@
<rejection class="QWidgetItem" field-name="wid"/>
<rejection class="QFont" enum-name="ResolveProperties"/>
<rejection class="QGradient" enum-name="InterpolationMode"/>
<rejection class="QIconEngine::ScaledPixmapArgument" since-version="5.9"/>
<rejection class="QIconEngineV2::AvailableSizesArgument"/>
<rejection class="QIconEngineV2" enum-name="IconEngineHook"/>
<rejection class="QGradient::QGradientData"/>
<rejection class="QGradient" enum-name="InterpolationMode"/>
<rejection class="QGradient" function-name="setInterpolationMode"/>
<rejection class="QGradient" function-name="interpolationMode"/>
<rejection class="QAbstractTextDocumentLayout" function-name="handlerForObject"/>
<rejection class="QPixmap" function-name="fromImageInPlace"/>
<rejection class="QPixmap" function-name="fromImageInPlace"/>

<enum-type name="QStaticText::PerformanceHint"/>
<enum-type name="QTextBlockFormat::LineHeightTypes"/>
Expand Down Expand Up @@ -390,6 +396,8 @@
<enum-type name="QStyleOptionHeader::SortIndicator"/>
<enum-type name="QStyleOptionHeader::StyleOptionType"/>
<enum-type name="QStyleOptionHeader::StyleOptionVersion"/>
<enum-type name="QStyleOptionHeaderV2::StyleOptionType"/>
<enum-type name="QStyleOptionHeaderV2::StyleOptionVersion"/>
<enum-type name="QStyleOptionMenuItem::CheckType"/>
<enum-type name="QStyleOptionMenuItem::MenuItemType"/>
<enum-type name="QStyleOptionMenuItem::StyleOptionType"/>
Expand Down Expand Up @@ -615,6 +623,7 @@
</modify-argument>
</modify-function>
</value-type>
<rejection class="QTransform::Affine"/>

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

<value-type name="QStyleOptionGroupBox" polymorphic-id-expression="%1-&gt;type == QStyleOptionGroupBox::Type &amp;&amp; %1-&gt;version == QStyleOptionGroupBox::Version"/>
<value-type name="QStyleOptionHeader" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version"/>
<value-type name="QStyleOptionHeaderV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeaderV2::Type &amp;&amp; %1-&gt;version == QStyleOptionHeaderV2::Version"/>
<value-type name="QStyleOptionMenuItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionMenuItem::Type &amp;&amp; %1-&gt;version == QStyleOptionMenuItem::Version"/>
<value-type name="QStyleOptionProgressBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBar::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBar::Version"/>

Expand Down Expand Up @@ -892,6 +902,7 @@
<modify-function signature="data()const" remove="all"/>
<modify-function signature="operator()(int, int)const" remove="all"/>
</value-type>
<rejection class="QMatrix4x4" enum-name="Flag"/>
<value-type name="QMatrix">
<extra-includes>
<include file-name="QPainterPath" location="global"/>
Expand Down Expand Up @@ -1120,6 +1131,7 @@ PyObject* constScanLine(QImage* image, int line) {
<modify-function signature="dark(int)const" remove="all"/> <!--### Obsolete in 4.3-->
<modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3-->
</value-type>
<rejection class="QColor::CT"/>

<value-type name="QFontMetricsF" expense-cost="1" expense-limit="1000">
<modify-function signature="operator!=(const QFontMetricsF &amp;)">
Expand Down Expand Up @@ -1326,6 +1338,7 @@ PyObject* constScanLine(QImage* image, int line) {
<object-type name="QHeaderView">
</object-type>
<object-type name="QIconEngine">
<modify-function signature="virtual_hook(int,void*)" remove="all"/>
</object-type>
<object-type name="QIconEngineV2">
<modify-function signature="virtual_hook(int,void*)" remove="all"/>
Expand Down Expand Up @@ -2936,6 +2949,7 @@ PyObject* constScanLine(QImage* image, int line) {
</modify-argument>
</modify-function>
</object-type>
<value-type name="QFormLayout::TakeRowResult" since-version="5.8"/>

<object-type name="QGraphicsGridLayout">
<modify-function signature="addItem(QGraphicsLayoutItem*,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
Expand Down Expand Up @@ -3078,6 +3092,7 @@ PyObject* constScanLine(QImage* image, int line) {
<object-type name="QOpenGLTimeMonitor"/>
<object-type name="QOpenGLTimerQuery"/>
<object-type name="QOpenGLVersionProfile"/>
<object-type name="QOpenGLVersionFunctionsFactory" since-version="6"/>
<object-type name="QOpenGLVertexArrayObject"/>
<object-type name="QPageLayout"/>
<object-type name="QPageSize"/>
Expand All @@ -3096,7 +3111,8 @@ PyObject* constScanLine(QImage* image, int line) {
<interface-type name="QPagedPaintDevice" create-shell="no">
<modify-function signature="devicePageLayout()const" remove="all"/>
</interface-type>
<interface-type name="QPageRanges"/>
<interface-type name="QPageRanges" since-version="6"/>
<value-type name="QPageRanges::Range" since-version="6"/>

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

<object-type name="QConcatenateTablesProxyModel" since-version="5.13"/>
<object-type name="QTransposeProxyModel" since-version="5.13"/>

<value-type name="QColorSpace" since-version="5.14"/>
Expand Down
5 changes: 5 additions & 0 deletions generator/typesystem_multimedia.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<rejection class="QAudioBuffer::StereoFrame"/>
<rejection class="QVideoFilterRunnable"/>
<rejection class="QAbstractVideoFilter"/>
<rejection class="QAudioFrame"/> <!-- template class -->
<rejection class="QWaveDecoder"/> <!-- not documented, probably should use QAudioDecoder instead -->

<enum-type name="QAudioFormat::Endian"/>
<enum-type name="QAudioFormat::SampleType"/>
Expand Down Expand Up @@ -126,11 +128,14 @@
<enum-type name="QVideoFrame::HandleType"/>
<enum-type name="QVideoFrame::MapMode"/>
<enum-type name="QVideoFrame::RotationAngle"/>
<object-type name="QVideoFrame::PaintOptions"/>
<enum-type name="QVideoFrame::PaintOptions::PaintFlag" flags="QVideoFrame::PaintOptions::PaintFlags"/>
</group>
<object-type name="QVideoProbe"/>
<object-type name="QVideoSurfaceFormat"/>
<object-type name="QCameraViewfinder"/>
<object-type name="QGraphicsVideoItem"/>
<rejection class="QGraphicsVideoItem" enum-name="enum_1"/>
<object-type name="QVideoWidget"/>
<object-type name="QAbstractAudioDeviceInfo"/>
<object-type name="QAbstractAudioInput"/>
Expand Down
19 changes: 10 additions & 9 deletions generator/typesystem_network.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
</namespace-type>

<rejection class="QSqlError::Unused"/>
<rejection class="QSslConfiguration" function-name="defaultDtlsConfiguration"/>
<rejection class="QSslConfiguration" function-name="dtlsCookieVerificationEnabled"/>
<rejection class="QSslConfiguration" function-name="setDefaultDtlsConfiguration"/>
<rejection class="QSslConfiguration" function-name="setDtlsCookieVerificationEnabled"/>

<enum-type name="QSsl::AlertLevel" since-version="6"/>
<enum-type name="QSsl::AlertType" since-version="6"/>
Expand Down Expand Up @@ -112,8 +108,6 @@
</object-type>
<object-type name="QNetworkCookieJar"/>
<object-type name="QNetworkReply">
<modify-function signature="setSslConfiguration(QSslConfiguration)" remove="all"/>
<modify-function signature="sslConfiguration() const" remove="all"/>
<modify-function signature="ignoreSslErrors(const QList&lt;QSslError&gt;&amp;)" remove="all"/>
</object-type>

Expand Down Expand Up @@ -174,8 +168,6 @@
</value-type>
<value-type name="QNetworkRequest">
<modify-function signature="operator=(QNetworkRequest)" remove="all"/>
<modify-function signature="setSslConfiguration(QSslConfiguration)" remove="all"/>
<modify-function signature="sslConfiguration() const" remove="all"/>
</value-type>

<enum-type name="QSslError::SslError"/>
Expand All @@ -193,6 +185,8 @@
</extra-includes>
</value-type>
<value-type name="QSslConfiguration"/>
<value-type name="QSslDiffieHellmanParameters" since-version="5.8"/>
<enum-type name="QSslDiffieHellmanParameters::Error" since-version="5.8"/>

<object-type name="QSslSocket"/>

Expand Down Expand Up @@ -236,10 +230,17 @@
<object-type name="QDtls" since-version="5.12"/>
<enum-type name="QDtls::HandshakeState" since-version="5.12"/>
<object-type name="QDtlsClientVerifier" since-version="5.12"/>
<value-type name="QDtlsClientVerifier::GeneratorParameters" since-version="5.12"/>

<object-type name="QHttp1Configuration" since-version="6.5"/>
<rejection class="QHttp1Configuration::ShortData" since-version="6.5"/>
<rejection class="QHttp1Configuration::U" since-version="6.5"/>
<object-type name="QHttp2Configuration" since-version="5.14"/>


<object-type name="QOcspResponse" since-version="5.13"/>
<enum-type name="QOcspCertificateStatus" since-version="5.13"/>
<enum-type name="QOcspRevocationReason" since-version="5.13"/>

<object-type name="QNetworkInformation" since-version="6.1"/>
<enum-type name="QNetworkInformation::Feature" flags="QNetworkInformation::Features" since-version="6.1"/>

Expand Down
15 changes: 15 additions & 0 deletions generator/typesystem_qml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
<rejection class="QQmlListProperty"/>
<rejection class="QQmlTypeInfo"/>
<rejection class="QQmlImageProviderBase"/>
<rejection class="QQmlContext::PropertyPair"/>
<rejection class="QQmlEngineExtensionInterface"/>
<rejection class="QQmlEngineExtensionPlugin"/>
<rejection class="QQmlModuleRegistration"/>
<rejection class="QQmlTriviallyDestructibleDebuggingEnabler"/>
<rejection class="QQmlTypeNotAvailable"/>
<rejection class="QmlTypeAndRevisionsRegistration"/>
<rejection enum-name="QQmlModuleImportSpecialVersions"/>

<object-type name="QJSEngine">
<modify-function signature="newQMetaObject()" remove="all"/>
Expand All @@ -16,6 +24,13 @@
<modify-function signature="operator++(int)" remove="all"/>
<modify-function signature="operator--(int)" remove="all"/>
</object-type>
<rejection class="QJSPrimitiveValue::AddOperators" since-version="6.1"/>
<rejection class="QJSPrimitiveValue::DivOperators" since-version="6.1"/>
<rejection class="QJSPrimitiveValue::MulOperators" since-version="6.1"/>
<rejection class="QJSPrimitiveValue::QJSPrimitiveValuePrivate" since-version="6.1"/>
<rejection class="QJSPrimitiveValue::StringNaNOperators" since-version="6.1"/>
<rejection class="QJSPrimitiveValue::SubOperators" since-version="6.1"/>

<object-type name="QJSPrimitiveUndefined" since-version="6.1"/>
<object-type name="QJSPrimitiveNull" since-version="6.1"/>

Expand Down
11 changes: 9 additions & 2 deletions generator/typesystem_quick.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,16 @@
<object-type name="QQuickTextDocument"></object-type>
<object-type name="QQuickTransform"></object-type>
<object-type name="QQuickView"></object-type>
<object-type name="QQuickWindow"></object-type>
<object-type name="QQuickWindow"/>
<object-type name="QQuickWindow::GraphicsStateInfo" since-version="5.14"/>

<object-type name="QQuickWidget"></object-type>
<object-type name="QQuickWidget"/>

<object-type name="QQuickGraphicsConfiguration" since-version="6"/>
<rejection class="QQuickGraphicsDevice" since-version="6"/>
<object-type name="QQuickRenderTarget" since-version="6"/>
<!-- Linker error on GitHub CI (Windows, Qt 6.5): -->
<rejection class="QQuickRenderTarget" function-name="fromVulkanImage" since-version="6"/>

<object-type name="QSGAbstractRenderer"></object-type>
<object-type name="QSGBasicGeometryNode"></object-type>
Expand Down
18 changes: 18 additions & 0 deletions generator/typesystem_webenginewidgets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
</object-type>
<object-type name="QWebEnginePage">
</object-type>

<object-type name="QWebChannel"/>
<object-type name="QWebChannelAbstractTransport"/>

<object-type name="QWebEngineCertificateError"/>
<object-type name="QWebEngineCookieStore"/>
<value-type name="QWebEngineCookieStore::FilterRequest" since-version="5.11"/>
<object-type name="QWebEngineDownloadItem"/>
<object-type name="QWebEngineFullScreenRequest"/>
<object-type name="QWebEngineHistory"/>
Expand All @@ -22,21 +26,35 @@
<object-type name="QWebEngineUrlRequestInterceptor"/>
<object-type name="QWebEngineUrlRequestJob"/>
<object-type name="QWebEngineUrlSchemeHandler"/>
<object-type name="QWebEngineUrlScheme" since-version="5.12"/>
<enum-type name="QWebEngineUrlScheme::Flag" flags="QWebEngineUrlScheme::Flags" since-version="5.12"/>
<enum-type name="QWebEngineUrlScheme::SpecialPort" since-version="5.12"/>
<enum-type name="QWebEngineUrlScheme::Syntax" since-version="5.12"/>
<object-type name="QWebEngineNotification" since-version="5.13"/>
<object-type name="QWebEngineClientCertificateSelection" since-version="5.12"/>
<object-type name="QWebEngineClientCertificateStore" since-version="5.13"/>
<object-type name="QWebEngineFindTextResult" since-version="5.14"/>
<object-type name="QWebEngineLoadingInfo" since-version="6.2"/>
<enum-type name="QWebEngineLoadingInfo::ErrorDomain" since-version="6.2"/>
<enum-type name="QWebEngineLoadingInfo::LoadStatus" since-version="6.2"/>
<object-type name="QWebEngineContextMenuRequest" since-version="6.2"/>
<enum-type name="QWebEngineContextMenuRequest::EditFlag" flags="QWebEngineContextMenuRequest::EditFlags" since-version="6.2"/>
<enum-type name="QWebEngineContextMenuRequest::MediaFlag" flags="QWebEngineContextMenuRequest::MediaFlags" since-version="6.2"/>
<enum-type name="QWebEngineContextMenuRequest::MediaType" since-version="6.2"/>
<object-type name="QWebEngineDownloadRequest" since-version="6"/>
<enum-type name="QWebEngineDownloadRequest::DownloadInterruptReason" since-version="6"/>
<enum-type name="QWebEngineDownloadRequest::DownloadState" since-version="6"/>
<enum-type name="QWebEngineDownloadRequest::SavePageFormat" since-version="6"/>
<object-type name="QWebEngineNavigationRequest" since-version="6.2"/>
<object-type name="QWebEngineNewWindowRequest" since-version="6.2"/>
<enum-type name="QWebEngineNewWindowRequest::DestinationType" since-version="6.2"/>
<object-type name="QWebEngineFileSystemAccessRequest" since-version="6.4"/>
<enum-type name="QWebEngineFileSystemAccessRequest::AccessFlag" flags="QWebEngineFileSystemAccessRequest::AccessFlags" since-version="6.4"/>
<enum-type name="QWebEngineFileSystemAccessRequest::HandleType" since-version="6.4"/>
<object-type name="QWebEngineHttpRequest" since-version="5.9"/>
<enum-type name="QWebEngineHttpRequest::Method" since-version="5.9"/>
<object-type name="QWebEngineQuotaRequest" since-version="5.11"/>
<object-type name="QWebEngineRegisterProtocolHandlerRequest" since-version="5.11"/>

<enum-type name="QWebEngineCertificateError::Error"/>
<enum-type name="QWebEngineDownloadItem::DownloadState"/>
Expand Down
1 change: 1 addition & 0 deletions generator/typesystem_xml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
<modify-function signature="QXmlStreamReader(const char*)" remove="all"/>
<modify-function signature="addData(const char*)" remove="all"/>
</object-type>
<rejection class="QXmlStreamReader::PrivateConstructorTag"/>
<object-type name="QXmlStreamWriter">
<modify-function signature="QXmlStreamWriter(QString *)">
<remove/>
Expand Down

0 comments on commit d0e46f4

Please sign in to comment.