code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2024-12-22 08:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

genbindings/config: adjustments for Qt 6.7 support

Browse Source
This commit is contained in:
mappu 2024-10-26 12:33:49 +13:00
parent c1b31e787b
commit ba9f518767
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/genbindings/config-allowlist.go
View File

@ -118,6 +118,7 @@ func ImportHeaderForClass(className string) bool {
"QTextEngine", // qtextlayout.h "QTextEngine", // qtextlayout.h
"QText", // e.g. qtextcursor.h "QText", // e.g. qtextcursor.h
"QVLABaseBase", // e.g. Qt 6 qvarlengtharray.h "QVLABaseBase", // e.g. Qt 6 qvarlengtharray.h
"QAdoptSharedDataTag", // Qt 6 qshareddata.h
"____last____": "____last____":
return false return false
} }
@ -127,7 +128,7 @@ func ImportHeaderForClass(className string) bool {
func AllowClass(className string) bool { func AllowClass(className string) bool {
if strings.HasSuffix(className, "Private") { if strings.HasSuffix(className, "Private") || strings.HasSuffix(className, "PrivateShared") {
return false return false
} }
@ -156,6 +157,9 @@ func AllowClass(className string) bool {
"QSequentialIterable", // Qt 6. Extends a QIterator<>, too hard "QSequentialIterable", // Qt 6. Extends a QIterator<>, too hard
"QBrushDataPointerDeleter", // Qt 6 qbrush.h. Appears in header but cannot be linked "QBrushDataPointerDeleter", // Qt 6 qbrush.h. Appears in header but cannot be linked
"QPropertyBindingPrivatePtr", // Qt 6 qpropertyprivate.h. Appears in header but cannot be linked "QPropertyBindingPrivatePtr", // Qt 6 qpropertyprivate.h. Appears in header but cannot be linked
"QDeferredDeleteEvent", // Qt 6. Hidden/undocumented class in Qt 6.4, moved to private header in Qt 6.7. Intended for test use only
"QUntypedPropertyData::InheritsQUntypedPropertyData", // qpropertyprivate.h . Hidden/undocumented class in Qt 6.4, removed in 6.7
"____last____": "____last____":
return false return false
} }
@ -195,6 +199,14 @@ func AllowMethod(className string, mm CppMethod) error {
return ErrTooComplex return ErrTooComplex
} }
if className == "QBitArray" && mm.MethodName == "operator~" {
return ErrTooComplex // Present in Qt 5.15 and 6.4, missing in Qt 6.7
}
if className == "QTimeZone" && (mm.MethodName == "operator==" || mm.MethodName == "operator!=") {
return ErrTooComplex // Present in Qt 5.15 and 6.4, missing in Qt 6.7
}
return nil // OK, allow return nil // OK, allow
} }
@ -403,4 +415,13 @@ func ApplyQuirks(className string, mm *CppMethod) {
if className == "QArrayData" && mm.MethodName == "needsDetach" && mm.IsConst { if className == "QArrayData" && mm.MethodName == "needsDetach" && mm.IsConst {
mm.BecomesNonConstInVersion = addr("6.7") mm.BecomesNonConstInVersion = addr("6.7")
} }
if className == "QFileDialog" && mm.MethodName == "saveFileContent" && mm.IsStatic {
// The prototype was changed from
// [Qt 5 - 6.6] void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint = QString())
// [Qt 6.7] void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint, QWidget *parent = nullptr)
// The 2nd parameter is no longer optional
// As a compromise, make it non-optional everywhere
mm.Parameters[1].Optional = false
}
} }