luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-08-29 01:14:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility with Qt 6.7

Browse Source
This commit is contained in:
Matthias Koefferlein
2024-06-02 19:11:17 +02:00
parent 46bb28d4e4
commit 1144b07ebb
5 changed files with 7 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mkqtdecl6/mkqtdecl.conf
+6 -4
View File
@@ -132,6 +132,7 @@ drop_class "QContainerInfo"
drop_class "QContiguousCache"
drop_class "QContiguousCacheData"
drop_class "QContiguousCacheTypedData"
drop_class "QDeferredDeleteEvent" # was a mistake, I think
drop_class "QEnableSharedFromThis"
drop_class "QException" # (TODO) no mapping yet
drop_class "QExplicitlySharedDataPointer"
@@ -258,7 +259,6 @@ drop_class "QStringBuilder"
drop_class "QStringBuilder"
drop_class "QStringBuilderBase"
drop_class "QStringBuilderCommon"
# @@@ drop_class "QStringConverterBase"
drop_class "QStringDecoder", /EncodedData/
drop_class "QStringEncoder", /DecodedData/
drop_class "QStringListIterator"
@@ -460,6 +460,8 @@ drop_method "QTextCodec", /QTextCodec::codecForName\(const\s+QByteArray/ # clash
drop_method "QTextCodec", /QTextCodec::toUnicode\(const\s+QByteArray/ # clashes with const char * variant
drop_method "QTextCodec", /QTextCodec::fromUnicode\(const\s+QChar\s+\*/ # requires real QChar *
drop_method "QTextEncoder", /QTextEncoder::fromUnicode\(const\s+QChar\s+\*/ # requires real QChar *
drop_method "QTimeZone", /::operator\s*==/ # no longer supported on Qt 6.7
drop_method "QTimeZone", /::operator\s*!=/ # no longer supported on Qt 6.7
drop_method "", /::operator\s*==\(const\s+QVariant\s*&\w+,\s*const\s+QVariantComparisonHelper/ # requires QVariantComparisonHelper
drop_method "", /::operator\s*!=\(const\s+QVariant\s*&\w+,\s*const\s+QVariantComparisonHelper/ # requires QVariantComparisonHelper
drop_method "QByteArrayMatcher", /QByteArrayMatcher::indexIn\(const\s+QByteArray/ # clashes with const char * variant
@@ -535,7 +537,6 @@ no_copy_ctor "QBasicMutex"
no_copy_ctor "QMapDataBase"
no_copy_ctor "QChildEvent"
no_copy_ctor "QDynamicPropertyChangeEvent"
no_copy_ctor "QDeferredDeleteEvent"
no_copy_ctor "QEvent"
no_copy_ctor "QPropertyNotifier"
no_copy_ctor "QPropertyObserver"
@@ -859,6 +860,7 @@ include "QWindow", [ "<QWindow>", "<QScreen>",
"<QShowEvent>", "<QTabletEvent>", "<QTouchEvent>", "<QWheelEvent>" ]
include "QOffscreenSurface", [ "<QOffscreenSurface>", "<QScreen>" ]
include "QScreenOrientationChangeEvent", [ "<QScreenOrientationChangeEvent>", "<QScreen>" ]
include "QPointerEvent", [ "<QPointer>" ] # needed for Qt 6.7
drop_method "QWindow", /QWindow::handle/ # QPlatformWindow not available
drop_method "QScreen", /QScreen::handle/ # QPlatformScreen not available
@@ -1284,8 +1286,8 @@ include "QOcspCertificateStatus", [ "<QOcspResponse>" ] # global enum without o
include "QDtlsError", [ "<QDtlsClientVerifier>" ] # global enum without own header
drop_class "QTlsPrivate" # private data
drop_class "QOcspResponse" # @@@ TODO: debug
drop_method "QSslSocket", /QSslSocket::ocspResponses\(/ # @@@ TODO: debug
drop_class "QOcspResponse" # TODO: debug
drop_method "QSslSocket", /QSslSocket::ocspResponses\(/ # TODO: debug
drop_method "QUrlInfo", /QUrlInfo::QUrlInfo\(.*permissions/ # too many arguments (13)
drop_method "QHostAddress", /QHostAddress::QHostAddress\(\s*(const\s*)?quint8\s*\*/ # requires char *, a string version is available for IPv6