From 810ba7bec0b06ebcff105c1240b7108785f462b3 Mon Sep 17 00:00:00 2001 From: Uwe Siems Date: Thu, 14 Dec 2023 17:31:09 +0100 Subject: [PATCH] More typesystem entries (added classes and rejections) Just so that there are no unknown rejected classes and enums in the log file for Qt 6.6. The support for some of the new classes might be incomplete. --- generator/typesystem_core.xml | 209 +++++++++++++++++++++- generator/typesystem_gui.xml | 21 ++- generator/typesystem_multimedia.xml | 5 + generator/typesystem_network.xml | 19 +- generator/typesystem_qml.xml | 15 ++ generator/typesystem_quick.xml | 9 +- generator/typesystem_webenginewidgets.xml | 18 ++ generator/typesystem_xml.xml | 1 + 8 files changed, 282 insertions(+), 15 deletions(-) diff --git a/generator/typesystem_core.xml b/generator/typesystem_core.xml index c9e4ed7f2..ef2c2c3c0 100644 --- a/generator/typesystem_core.xml +++ b/generator/typesystem_core.xml @@ -19,21 +19,38 @@ + + + + + + + + + + + + + + + + + @@ -203,6 +220,8 @@ + + @@ -220,6 +239,7 @@ + @@ -241,6 +261,7 @@ + @@ -416,6 +437,8 @@ + + @@ -444,43 +467,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -513,6 +605,9 @@ + + + @@ -531,6 +626,20 @@ + + + + + + + + + + + + + + @@ -544,8 +653,11 @@ + + + @@ -968,6 +1080,7 @@ public: + @@ -989,6 +1102,8 @@ public: + + @@ -1104,6 +1219,7 @@ public: + @@ -1220,6 +1336,7 @@ public: + @@ -1345,7 +1462,6 @@ public: - PythonQt::Type_EnterExit @@ -1354,6 +1470,8 @@ public: void __exit__(QMutexLocker* self, PyObject* /*type*/, PyObject* /*value*/, PyObject* /*traceback*/) { self->unlock(); } + + PythonQt::Type_EnterExit @@ -1436,6 +1554,7 @@ public: + @@ -1464,6 +1583,9 @@ public: --> + + + @@ -1839,6 +1961,9 @@ public: + + + @@ -1858,6 +1983,83 @@ public: + + + + + + + + + + + + + + + + + + QByteArray readByteArray(QCborStreamReader* theWrappedObject) { + auto result = theWrappedObject->readByteArray(); + return result.status == QCborStreamReader::Ok ? result.data : QByteArray(); + } + + QString readString(QCborStreamReader* theWrappedObject) { + auto result = theWrappedObject->readString(); + return result.status == QCborStreamReader::Ok ? result.data : QString(); + } + + qint64 toTag(QCborStreamReader* theWrappedObject) const { + return static_cast<qint64>(theWrappedObject->toTag()); + } + + + + + + + // replace QCborTag with qint64: + QCborValue* new_QCborValue(qint64 tag, const QCborValue& taggedValue) { + return new QCborValue(QCborTag(tag), taggedValue); + } + + qint64 tag(QCborValue* theWrappedObject, qint64 defaultValue) const { + return static_cast<qint64>(theWrappedObject->tag(QCborTag(defaultValue))); + } + + + + + + + + + + + + void insert(QCborMap* theWrappedObject, qint64 key, const QCborValue& value_) + { + theWrappedObject->insert(key, value_); + } + + void insert(QCborMap* theWrappedObject, const QString& key, const QCborValue& value_) + { + theWrappedObject->insert(key, value_); + } + + + + + + + + + + + + + @@ -2075,6 +2277,9 @@ public: + + + diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml index b535379be..6ab6fe105 100644 --- a/generator/typesystem_gui.xml +++ b/generator/typesystem_gui.xml @@ -22,11 +22,13 @@ + + @@ -84,6 +86,7 @@ + @@ -104,6 +107,7 @@ + @@ -156,13 +160,15 @@ + + - + @@ -390,6 +396,8 @@ + + @@ -615,6 +623,7 @@ + @@ -641,6 +650,7 @@ + @@ -892,6 +902,7 @@ + @@ -1120,6 +1131,7 @@ PyObject* constScanLine(QImage* image, int line) { + @@ -1326,6 +1338,7 @@ PyObject* constScanLine(QImage* image, int line) { + @@ -2936,6 +2949,7 @@ PyObject* constScanLine(QImage* image, int line) { + @@ -3078,6 +3092,7 @@ PyObject* constScanLine(QImage* image, int line) { + @@ -3096,7 +3111,8 @@ PyObject* constScanLine(QImage* image, int line) { - + + @@ -3180,6 +3196,7 @@ PyObject* constScanLine(QImage* image, int line) { + diff --git a/generator/typesystem_multimedia.xml b/generator/typesystem_multimedia.xml index 9d16a39c4..54c1b0d15 100644 --- a/generator/typesystem_multimedia.xml +++ b/generator/typesystem_multimedia.xml @@ -7,6 +7,8 @@ + + @@ -126,11 +128,14 @@ + + + diff --git a/generator/typesystem_network.xml b/generator/typesystem_network.xml index 2c3d13605..77e998a88 100644 --- a/generator/typesystem_network.xml +++ b/generator/typesystem_network.xml @@ -5,10 +5,6 @@ - - - - @@ -112,8 +108,6 @@ - - @@ -174,8 +168,6 @@ - - @@ -193,6 +185,8 @@ + + @@ -236,10 +230,17 @@ + + + - + + + + + diff --git a/generator/typesystem_qml.xml b/generator/typesystem_qml.xml index 21952240a..af5d0bdbc 100644 --- a/generator/typesystem_qml.xml +++ b/generator/typesystem_qml.xml @@ -6,6 +6,14 @@ + + + + + + + + @@ -16,6 +24,13 @@ + + + + + + + diff --git a/generator/typesystem_quick.xml b/generator/typesystem_quick.xml index bd255e686..947649ef4 100644 --- a/generator/typesystem_quick.xml +++ b/generator/typesystem_quick.xml @@ -29,9 +29,14 @@ - + + - + + + + + diff --git a/generator/typesystem_webenginewidgets.xml b/generator/typesystem_webenginewidgets.xml index 8f8020bec..0c3769178 100644 --- a/generator/typesystem_webenginewidgets.xml +++ b/generator/typesystem_webenginewidgets.xml @@ -5,9 +5,13 @@ + + + + @@ -22,8 +26,14 @@ + + + + + + @@ -31,12 +41,20 @@ + + + + + + + + diff --git a/generator/typesystem_xml.xml b/generator/typesystem_xml.xml index 4a57a2189..ad07ddead 100644 --- a/generator/typesystem_xml.xml +++ b/generator/typesystem_xml.xml @@ -181,6 +181,7 @@ +