Skip to content

Adjustments for Qt 6.10 #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrbean-bremen merged 1 commit into from
Jan 2, 2026
Merged

Adjustments for Qt 6.10 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions generator/typesystem_core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<rejection class="QMetaTypeIdQObject"/>
<rejection class="QPalette::Data"/>

<rejection class="QRangeModel" since-version="6.10"/> <!-- templated range-based class -->
<rejection class="QScopedPointerObjectDeleteLater"/>
<rejection class="QScopedValueRollback"/>
<rejection class="QSequentialIterable"/>
Expand Down Expand Up @@ -973,6 +974,24 @@ public:
<modify-function signature="operator=(QString)" remove="all"/>
<modify-function signature="addResourceSearchPath(QString)" remove="all"/>
<!--### Obsolete in 4.3-->

<!-- Qt 6.10 changed mkpath/mkdir signatures to use std::optional<QFile::Permissions>
Since we don't support std::optional, we need to provide wrapper methods -->
<inject-code class="pywrap-h" since-version="6.10">
// Workaround for std::optional parameters in Qt 6.10
bool mkpath(QDir* theWrappedObject, const QString&amp; dirPath) const {
return theWrappedObject->mkpath(dirPath);
}
bool mkdir(QDir* theWrappedObject, const QString&amp; dirName) const {
return theWrappedObject->mkdir(dirName);
}
bool mkpath(QDir* theWrappedObject, const QString&amp; dirPath, QFile::Permissions permissions) const {
return theWrappedObject->mkpath(dirPath, permissions);
}
bool mkdir(QDir* theWrappedObject, const QString&amp; dirName, QFile::Permissions permissions) const {
return theWrappedObject->mkdir(dirName, permissions);
}
</inject-code>
</value-type>

<value-type name="QPoint">
Expand Down
2 changes: 2 additions & 0 deletions generator/typesystem_gui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,7 @@
<value-type name="QFontVariableAxis" since-version="6.9"/>
<value-type name="QPainterStateGuard" since-version="6.9"/>
<enum-type name="QPainterStateGuard::InitialState" since-version="6.9"/>
<object-type name="QAccessibilityHints" since-version="6.10"/>

<value-type name="QTextTableCell">
<extra-includes>
Expand Down Expand Up @@ -2336,6 +2337,7 @@ PyObject* constScanLine(QImage* image, int line) {
<object-type name="QDateTimeEdit">
</object-type>

<enum-type name="QSortFilterProxyModel::Direction" since-version="6.10"/>
<object-type name="QSortFilterProxyModel">
<modify-function signature="parent()const" remove="all"/>
<extra-includes>
Expand Down
1 change: 1 addition & 0 deletions generator/typesystem_xml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<enum-type name="QXmlStreamReader::Error"/>
<enum-type name="QXmlStreamReader::TokenType"/>
<enum-type name="QXmlStreamReader::ReadElementTextBehaviour"/>
<enum-type name="QXmlStreamWriter::Error" since-version="6.10"/>


<value-type name="QDomAttr">
Expand Down