Skip to content

Commit 4a2aa6a

Browse files
committed
Type system database adaptations for Qt 6.11
1 parent d31c2a0 commit 4a2aa6a

3 files changed

Lines changed: 45 additions & 0 deletions

File tree

generator/typesystem_core.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@
526526
<rejection class="QTaggedPointer"/>
527527
<rejection class="QTextStreamManipulator"/>
528528
<rejection class="QThreadStorage"/>
529+
<rejection class="QThreadStorageTraits" since-version="6.11"/>
529530
<rejection class="QThreadStorageData"/>
530531
<rejection class="QTimeZone::Data"/>
531532
<rejection class="QTimeZone::ShortData"/>
@@ -720,6 +721,38 @@
720721

721722
<rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/>
722723

724+
<group since-version="6.11">
725+
<!-- qrangemodeladapter_impl.h -->
726+
<rejection class="AdapterStorage"/>
727+
<rejection class="AsConstData"/>
728+
<rejection class="AsConstRow"/>
729+
<rejection class="AutoConnectContext"/>
730+
<rejection class="ConnectionStorage"/>
731+
<rejection class="DefaultTreeProtocol"/>
732+
<rejection class="ListProtocol"/>
733+
<rejection class="ModelData"/>
734+
<rejection class="ParentIndex"/>
735+
<rejection class="PropertyCache"/>
736+
<rejection class="PropertyData"/>
737+
<rejection class="QGenericTableItemModelImpl"/>
738+
<rejection class="QGenericTreeItemModelImpl"/>
739+
<rejection class="QRangeModelAdapter"/>
740+
<rejection class="QRangeModelImpl"/>
741+
<rejection class="QRangeModelImplBase"/>
742+
<rejection class="RowView"/>
743+
<rejection class="Storage"/>
744+
<rejection class="TableProtocol"/>
745+
<rejection class="is_tree_range"/>
746+
<rejection class="item_traits"/>
747+
<rejection class="protocol_deleteRow"/>
748+
<rejection class="protocol_newRow"/>
749+
<rejection class="protocol_traits"/>
750+
<rejection class="row_traits"/>
751+
</group>
752+
753+
754+
755+
723756
<namespace-type name="Qt">
724757

725758
<extra-includes>
@@ -1123,6 +1156,7 @@ public:
11231156
</modify-function>
11241157
</value-type>
11251158

1159+
<object-type name="QBasicReadWriteLock" since-version="6.11"/>
11261160
<object-type name="QReadWriteLock"/>
11271161
<object-type name="QDirIterator"/>
11281162
<object-type name="QAbstractFileEngineIterator"/>
@@ -2235,6 +2269,7 @@ public:
22352269
<modify-function signature="operator()()" remove="all"/>
22362270
<modify-function signature="operator()()const" remove="all"/>
22372271
</object-type>
2272+
<value-type name="QLoggingCategory::UnregisteredInitialization" since-version="6.11"/>
22382273

22392274

22402275
<!-- <object-type name="QAccessibleActionInterface"/> -->
@@ -2281,6 +2316,7 @@ public:
22812316
<enum-type name="Qt::TimerType"/>
22822317
<enum-type name="Qt::Edge"/>
22832318
<enum-type name="Qt::ColorScheme" since-version="6"/>
2319+
<enum-type name="Qt::ContrastPreference" since-version="6.11"/>
22842320

22852321
<object-type name="QDeadlineTimer"/>
22862322
<object-type name="QOperatingSystemVersionBase"/>

generator/typesystem_gui.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<rejection class="QAccessibleTextUpdateEvent"/>
4242
<rejection class="QAccessibleValueChangeEvent"/>
4343
<rejection class="QAccessibleWidget"/>
44+
<rejection class="QAccessibleWidgetV2" since-version="6.11"/>
4445
<rejection class="QOpenGLDebugLogger"/>
4546
<rejection class="QOpenGLDebugMessage"/>
4647
<rejection class="QOpenGLExtraFunctions"/>
@@ -407,6 +408,7 @@
407408
<enum-type name="QStyleOptionMenuItem::MenuItemType"/>
408409
<enum-type name="QStyleOptionMenuItem::StyleOptionType"/>
409410
<enum-type name="QStyleOptionMenuItem::StyleOptionVersion"/>
411+
<enum-type name="QStyleOptionMenuItemV2::StyleOptionVersion" since-version="6.11"/>
410412
<enum-type name="QStyleOptionProgressBar::StyleOptionType"/>
411413
<enum-type name="QStyleOptionProgressBar::StyleOptionVersion"/>
412414
<enum-type name="QStyleOptionProgressBarV2::StyleOptionType"/>
@@ -657,6 +659,7 @@
657659
<value-type name="QStyleOptionHeader" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version"/>
658660
<value-type name="QStyleOptionHeaderV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeaderV2::Type &amp;&amp; %1-&gt;version == QStyleOptionHeaderV2::Version"/>
659661
<value-type name="QStyleOptionMenuItem" polymorphic-id-expression="%1-&gt;type == QStyleOptionMenuItem::Type &amp;&amp; %1-&gt;version == QStyleOptionMenuItem::Version"/>
662+
<value-type name="QStyleOptionMenuItemV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionMenuItem::Type &amp;&amp; %1-&gt;version == QStyleOptionMenuItemV2::Version" since-version="6.11"/>
660663
<value-type name="QStyleOptionProgressBar" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBar::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBar::Version"/>
661664

662665
<value-type name="QStyleOptionProgressBarV2" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBarV2::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBarV2::Version">
@@ -2873,6 +2876,10 @@ PyObject* constScanLine(QImage* image, int line) {
28732876
<object-type name="QMouseEventTransition"/>
28742877
<object-type name="QKeyEventTransition"/>
28752878
<value-type name="QQuaternion"/>
2879+
<value-type name="QQuaternion::Axis" since-version="6.11"/>
2880+
<value-type name="QQuaternion::Axes" since-version="6.11"/>
2881+
<!-- QQuaternion::EulerAngles is a templated type -->
2882+
<rejection class="QQuaternion::EulerAngles" since-version="6.11"/>
28762883

28772884
<object-type name="QCommandLinkButton"/>
28782885
<object-type name="QFileSystemModel">

generator/typesystem_sql.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<include file-name="qtsqlglobal.h" location="global" since-version="6"/>
1212
</namespace-type>
1313

14+
<value-type name="QSqlDatabaseDefaultConnectionName" since-version="6.11"/>
15+
1416
<value-type name="QSqlDatabase">
1517
<extra-includes>
1618
<include file-name="QSqlQuery" location="global"/>

0 commit comments

Comments
 (0)