luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compatibility with Qt 6.6

This commit is contained in:
Matthias Koefferlein 2023-11-12 00:29:00 +01:00
parent 647a52dc70
commit c1da4cc11a
4 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mkqtdecl6/mkqtdecl.conf
View File

@ -67,6 +67,7 @@ drop_class "QAbstractConcatenable"
drop_class "QAbstractFileEngineHandler"
drop_class "QAbstractFileEngineIterator"
drop_class "QAbstractFileEngine" # read requires char *
drop_class "QAdoptSharedDataTag" # not available on Qt 6.6
drop_class "QAlgorithmsPrivate"
drop_class "QApplicationPermission"
drop_class "QArgument"
@ -1304,6 +1305,11 @@ include "QSql", [ "<QtSql>" ]
drop_class "QSqlDriverCreator" # is a template
drop_class "QSqlDriverPlugin" # not required ?
drop_method "QSqlResult", /QSqlResult::boundValues/ # returns a reference, different types on different Qt versions
rename "QSqlDriver", /QSqlDriver::notification\(const\s+QString\s*\&\s*\w*\s*\)/, "notification" # disambiguator
rename "QSqlDriver", /QSqlDriver::notification\(const\s+QString\s*\&\s*\w*\s*,/, "notification_withData" # disambiguator
# --------------------------------------------------------------
# QtMultimedia
@ -1594,9 +1600,6 @@ rename "QVideoDeviceSelectorControl", /QVideoDeviceSelectorControl::selectedDevi
rename "QNetworkSession", /QNetworkSession::error\(QNetworkSession::/, "error_sig" # disambiguator
rename "QSqlDriver", /QSqlDriver::notification\(const\s+QString\s*\&\s*\w*\s*\)/, "notification" # disambiguator
rename "QSqlDriver", /QSqlDriver::notification\(const\s+QString\s*\&\s*\w*\s*,/, "notification_withData" # disambiguator
# --------------------------------------------------------------
# QtUiTools

1
src/gsiqt/qt6/QtCore/QtCore.pri
View File

@ -15,7 +15,6 @@ SOURCES += \
$$PWD/gsiDeclQAbstractNativeEventFilter.cc \
$$PWD/gsiDeclQAbstractProxyModel.cc \
$$PWD/gsiDeclQAbstractTableModel.cc \
$$PWD/gsiDeclQAdoptSharedDataTag.cc \
$$PWD/gsiDeclQAnimationDriver.cc \
$$PWD/gsiDeclQAnimationGroup.cc \
$$PWD/gsiDeclQAnyStringView.cc \

4
src/gsiqt/qt6/QtCore/gsiQtExternals.h
View File

@ -61,10 +61,6 @@ class QAbstractTableModel;
namespace gsi { GSI_QTCORE_PUBLIC gsi::Class<QAbstractTableModel> &qtdecl_QAbstractTableModel (); }
struct QAdoptSharedDataTag;
namespace gsi { GSI_QTCORE_PUBLIC gsi::Class<QAdoptSharedDataTag> &qtdecl_QAdoptSharedDataTag (); }
class QAnimationDriver;
namespace gsi { GSI_QTCORE_PUBLIC gsi::Class<QAnimationDriver> &qtdecl_QAnimationDriver (); }

20
src/gsiqt/qt6/QtSql/gsiDeclQSqlResult.cc
View File

@ -122,11 +122,6 @@ public:
return QSqlResult::boundValueName(pos);
}
// [expose] QList<QVariant> &QSqlResult::boundValues()
QList<QVariant> & fp_QSqlResult_boundValues_c0 () const {
return QSqlResult::boundValues();
}
// [expose] void QSqlResult::clear()
void fp_QSqlResult_clear_0 () {
QSqlResult::clear();
@ -873,20 +868,6 @@ static void _call_fp_boundValueName_c767 (const qt_gsi::GenericMethod * /*decl*/
}
// exposed QList<QVariant> &QSqlResult::boundValues()
static void _init_fp_boundValues_c0 (qt_gsi::GenericMethod *decl)
{
decl->set_return<QList<QVariant> & > ();
}
static void _call_fp_boundValues_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret)
{
__SUPPRESS_UNUSED_WARNING(args);
ret.write<QList<QVariant> & > ((QList<QVariant> &)((QSqlResult_Adaptor *)cls)->fp_QSqlResult_boundValues_c0 ());
}
// exposed void QSqlResult::clear()
static void _init_fp_clear_0 (qt_gsi::GenericMethod *decl)
@ -1662,7 +1643,6 @@ static gsi::Methods methods_QSqlResult_Adaptor () {
methods += new qt_gsi::GenericMethod ("*boundValue", "@brief Method QVariant QSqlResult::boundValue(int pos)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_boundValue_c767, &_call_fp_boundValue_c767);
methods += new qt_gsi::GenericMethod ("*boundValueCount", "@brief Method int QSqlResult::boundValueCount()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_boundValueCount_c0, &_call_fp_boundValueCount_c0);
methods += new qt_gsi::GenericMethod ("*boundValueName", "@brief Method QString QSqlResult::boundValueName(int pos)\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_boundValueName_c767, &_call_fp_boundValueName_c767);
methods += new qt_gsi::GenericMethod ("*boundValues", "@brief Method QList<QVariant> &QSqlResult::boundValues()\nThis method is protected and can only be called from inside a derived class.", true, &_init_fp_boundValues_c0, &_call_fp_boundValues_c0);
methods += new qt_gsi::GenericMethod ("*clear", "@brief Method void QSqlResult::clear()\nThis method is protected and can only be called from inside a derived class.", false, &_init_fp_clear_0, &_call_fp_clear_0);
methods += new qt_gsi::GenericMethod ("*data", "@brief Virtual method QVariant QSqlResult::data(int i)\nThis method can be reimplemented in a derived class.", false, &_init_cbs_data_767_0, &_call_cbs_data_767_0);
methods += new qt_gsi::GenericMethod ("*data", "@hide", false, &_init_cbs_data_767_0, &_call_cbs_data_767_0, &_set_callback_cbs_data_767_0);