luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-08-28 17:06:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issue #1987 (build failure against Qt6.8)

Browse Source
This commit is contained in:
Matthias Koefferlein
2025-02-16 20:28:22 +01:00
parent ccae17f08b
commit c3fe77acd0
3 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mkqtdecl6/mkqtdecl.conf
+26
View File
@@ -368,6 +368,8 @@ drop_method "QColormap", /QColormap::initialize/ # Must not hide Ruby's initiali
drop_method "QAccessible", /QAccessible::initialize/ # Must not hide Ruby's initialize and is not public
drop_method "QEasingCurve", /QEasingCurve::setCustomType/ # requires function *
drop_method "QEasingCurve", /QEasingCurve::customType/ # requires function *
drop_method "QEasingCurve", /::operator\s*==/ # no longer supported on Qt 6.8
drop_method "QEasingCurve", /::operator\s*!=/ # no longer supported on Qt 6.8
drop_method "QLibrary", /QLibrary::resolve/ # requires function *
drop_method "QLoggingCategory", /QLoggingCategory::installFilter/ # requires function *
drop_method "QMetaObject", /QMetaObject::cast\(/ # internal
@@ -473,6 +475,30 @@ drop_method "QDebug", /QDebug::operator\s*<<\((?!const\s+QString\s*&)/ # don't m
drop_method "", /::operator\s*<<\(QDebug\s*\w*\s*,\s*(?!const\s+QString\s*&)/ # don't map the others right now - too many (TODO: how to map?)
drop_method "QNoDebug", /QNoDebug::operator<</ # nothing usable (TODO: how to map?)
add_native_impl("QEasingCurve", <<'CODE', <<'DECL')
static bool QEasingCurve_operator_eq(const QEasingCurve *a, const QEasingCurve &b) {
return *a == b;
}
static bool QEasingCurve_operator_ne(const QEasingCurve *a, const QEasingCurve &b) {
return !(*a == b);
}
CODE
gsi::method_ext("==", &QEasingCurve_operator_eq, gsi::arg ("other"), "@brief Method bool QEasingCurve::operator==(const QEasingCurve &) const") +
gsi::method_ext("!=", &QEasingCurve_operator_ne, gsi::arg ("other"), "@brief Method bool QEasingCurve::operator!=(const QEasingCurve &) const")
DECL
add_native_impl("QTimeZone", <<'CODE', <<'DECL')
static bool QTimeZone_operator_eq(const QTimeZone *a, const QTimeZone &b) {
return *a == b;
}
static bool QTimeZone_operator_ne(const QTimeZone *a, const QTimeZone &b) {
return !(*a == b);
}
CODE
gsi::method_ext("==", &QTimeZone_operator_eq, gsi::arg ("other"), "@brief Method bool QTimeZone::operator==(const QTimeZone &) const") +
gsi::method_ext("!=", &QTimeZone_operator_ne, gsi::arg ("other"), "@brief Method bool QTimeZone::operator!=(const QTimeZone &) const")
DECL
include "QCoreApplication", [ "<QCoreApplication>", "<QAbstractEventDispatcher>", "<QAbstractNativeEventFilter>", "<QTranslator>" ]
include "QThread", [ "<QThread>", "<QAbstractEventDispatcher>" ]