diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-08-22 14:41:31 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-28 16:52:41 +0100 |
commit | a2486060f78a42739d88a460b47f23b0c75b4a79 (patch) | |
tree | a28e3514997ba132abd72c42829a47ecb003dad4 /sources/pyside6/PySide6 | |
parent | bb35f031a9680be6f8cf92ddc8e2cc9f3e309612 (diff) |
Adapt to Qt 6.7
Task-number: PYSIDE-2497
Change-Id: Id506616710ba06851401cf62511e49967acde71e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6')
22 files changed, 292 insertions, 23 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 25ceca5c8..47c3ae4ea 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -873,6 +873,7 @@ <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="core-snippets-p-h"/> <enum-type name="YearRange"/> + <enum-type name="TransitionResolution" since="6.7"/> <conversion-rule> <target-to-native> <add-conversion type="Py_None" file="../glue/qtcore.cpp" snippet="conversion-pynone"/> @@ -1334,6 +1335,7 @@ </object-type> <value-type name="QLocale"> + <enum-type name="TagSeparator" since="6.7"/> <enum-type name="Country"/> <enum-type name="DataSizeFormat" flags="DataSizeFormats"/> <enum-type name="FloatingPointPrecisionOption" python-type="IntEnum"/> @@ -1382,11 +1384,21 @@ <rename to="format"/> </modify-argument> </modify-function> - <modify-function signature="toDate(QString,QLocale::FormatType)const"> + <modify-function signature="toDate(QString,QLocale::FormatType,int)const"> <modify-argument index="2"> <rename to="format"/> </modify-argument> </modify-function> + <modify-function signature="^toDate(Time)?\(QString,[^,]+,int\)const$"> + <modify-argument index="3"> + <replace-default-expression with="1900"/> <!-- private FirstTwoDigitYear --> + </modify-argument> + </modify-function> + <modify-function signature="^toDate(Time)?\(QString,[^,]+,QCalendar,int\)const$"> + <modify-argument index="4"> + <replace-default-expression with="1900"/> <!-- private FirstTwoDigitYear --> + </modify-argument> + </modify-function> <modify-function signature="toUInt(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1717,7 +1729,9 @@ <reference-count action="set"/> </modify-argument> </modify-function> - + <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) --> + <modify-function signature="^moveToThread\(.*\)" remove="all"/> + <declare-function signature="moveToThread(QThread*)" return-type="bool"/> <modify-function signature="deleteLater()"> <modify-argument index="this"> <define-ownership owner="c++"/> @@ -2396,6 +2410,7 @@ <value-type name="QOperatingSystemVersionBase" since="6.3"> <enum-type name="OSType"/> </value-type> + <value-type name="QOperatingSystemVersionUnexported" since="6.3" generate="false"/> <value-type name="QOperatingSystemVersion"> <enum-type name="OSType"/> <modify-function signature="QOperatingSystemVersion(const QOperatingSystemVersionBase&)" remove="all"/> @@ -2813,7 +2828,7 @@ <add-function signature="readQVariant()" return-type="QVariant"> <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> - <modify-function signature="readRawData(char*,int)"> + <modify-function signature="readRawData(char*,qint64)"> <modify-argument index="return" pyi-type="bytes"/> <modify-argument index="1"> <remove-argument /> @@ -2824,7 +2839,7 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qdatastream-writerawdata-pybuffer"/> </add-function> - <modify-function signature="writeRawData(const char*,int)"> + <modify-function signature="writeRawData(const char*,qint64)"> <modify-argument index="1" pyi-type="str"/> <modify-argument index="2"> <remove-argument /> @@ -2906,7 +2921,7 @@ <add-function signature="writeString(QString)"> <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> - <modify-function signature="readBytes(char*&,uint&)"> + <modify-function signature="readBytes(char*&,qint64&)"> <modify-argument index="return"> <replace-type modified-type="PyTuple"/> </modify-argument> @@ -2915,8 +2930,9 @@ </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qdatastream-read-bytes"/> </modify-function> + <modify-function signature="readBytes(char*&,uint&)" remove="all"/> - <modify-function signature="writeBytes(const char*,uint)"> + <modify-function signature="writeBytes(const char*,qint64)"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> <conversion-rule class="native"> @@ -3579,7 +3595,8 @@ <!-- TODO: this need be removed --> <suppress-warning text="^skipping.*function '.*', unmatched return type '.*$"/> <suppress-warning text="^skipping.*function '.*', unmatched type '.*$"/> - <suppress-warning text="skipping public field 'QStringConverter::iface' with unmatched type 'QStringConverter::Interface'"/> + <suppress-warning text="skipping protected field 'QStringConverter::iface' with unmatched type 'QStringConverter::Interface'"/> + <suppress-warning text="^skipping public field 'Qt::.*' with unmatched type 'Qt::.*ordering'$"/> <suppress-warning text="skipping public field 'Qt::Uninitialized' with unmatched type 'Qt::Initialization'"/> <suppress-warning text="skipping public field 'State::clearFn' with unmatched type 'void'"/> <suppress-warning text="template baseclass 'QListSpecialMethods<T>' of 'QList' is not known"/> diff --git a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt index 751f8108e..96977e874 100644 --- a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt @@ -31,9 +31,6 @@ ${QtGraphs_GEN_DIR}/qsurface3dseries_wrapper.cpp ${QtGraphs_GEN_DIR}/qsurfacedataitem_wrapper.cpp ${QtGraphs_GEN_DIR}/qsurfacedataproxy_wrapper.cpp ${QtGraphs_GEN_DIR}/q3dbars_wrapper.cpp -${QtGraphs_GEN_DIR}/q3dcamera_wrapper.cpp -${QtGraphs_GEN_DIR}/q3dlight_wrapper.cpp -${QtGraphs_GEN_DIR}/q3dobject_wrapper.cpp ${QtGraphs_GEN_DIR}/q3dscatter_wrapper.cpp ${QtGraphs_GEN_DIR}/q3dscene_wrapper.cpp ${QtGraphs_GEN_DIR}/q3dsurface_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml b/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml index a0c22cf9c..49993123b 100644 --- a/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml +++ b/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml @@ -133,11 +133,6 @@ </modify-argument> </modify-function> </object-type> - <object-type name="Q3DCamera"> - <enum-type name="CameraPreset"/> - </object-type> - <object-type name="Q3DLight"/> - <object-type name="Q3DObject"/> <object-type name="Q3DScatter"> <modify-function signature="addAxis(QValue3DAxis*)"> <modify-argument index="1"> @@ -201,6 +196,7 @@ <enum-type name="RenderingMode"/> <enum-type name="SelectionFlag" flags="SelectionFlags"/> <enum-type name="ShadowQuality"/> + <enum-type name="CameraPreset" since="6.7"/> <modify-function signature="addCustomItem(QCustom3DItem*)"> <modify-argument index="1"> <parent index="this" action="add"/> diff --git a/sources/pyside6/PySide6/QtGui/CMakeLists.txt b/sources/pyside6/PySide6/QtGui/CMakeLists.txt index da150af76..9905c4d65 100644 --- a/sources/pyside6/PySide6/QtGui/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtGui/CMakeLists.txt @@ -106,6 +106,7 @@ ${QtGui_GEN_DIR}/qactiongroup_wrapper.cpp ${QtGui_GEN_DIR}/qbackingstore_wrapper.cpp ${QtGui_GEN_DIR}/qbitmap_wrapper.cpp ${QtGui_GEN_DIR}/qbrush_wrapper.cpp +${QtGui_GEN_DIR}/qchildwindowevent_wrapper.cpp ${QtGui_GEN_DIR}/qclipboard_wrapper.cpp ${QtGui_GEN_DIR}/qcloseevent_wrapper.cpp ${QtGui_GEN_DIR}/qcolor_wrapper.cpp @@ -129,6 +130,7 @@ ${QtGui_GEN_DIR}/qexposeevent_wrapper.cpp ${QtGui_GEN_DIR}/qfileopenevent_wrapper.cpp ${QtGui_GEN_DIR}/qfocusevent_wrapper.cpp ${QtGui_GEN_DIR}/qfont_wrapper.cpp +${QtGui_GEN_DIR}/qfont_tag_wrapper.cpp ${QtGui_GEN_DIR}/qfontdatabase_wrapper.cpp ${QtGui_GEN_DIR}/qfontinfo_wrapper.cpp ${QtGui_GEN_DIR}/qfontmetrics_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml index 98f1b0a37..a0c0d385d 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml @@ -480,6 +480,7 @@ <value-type name="QIcon" > <enum-type name="Mode"/> <enum-type name="State"/> + <enum-type name="ThemeIcon" since="6.7"/> <modify-function signature="QIcon(QIconEngine*)"> <modify-argument index="1"> <no-null-pointer/> @@ -615,6 +616,7 @@ <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> + <value-type name="Tag" since="6.7"/> <!-- PYSIDE-1685: QFont(QString) should be checked first, else it will be interpreted as sequence --> <modify-function signature="QFont(const QString&,int,int, bool)" overload-number="0"/> <modify-function signature="QFont(const QStringList &,int,int, bool)" overload-number="1"/> @@ -1344,6 +1346,8 @@ </inject-code> </add-function> </object-type> + <object-type name="QChildWindowEvent" copyable="false" since="6.7" + polymorphic-id-expression="%1->type() == QEvent::ChildWindowAdded || %1->type() == QEvent::ChildWindowRemoved"/> <object-type name="QEnterEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::Enter"/> <object-type name="QExposeEvent" polymorphic-id-expression="%1->type() == QEvent::Expose"/> <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> diff --git a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt index 9e39680e3..5cac97ca9 100644 --- a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt @@ -29,6 +29,7 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp ${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp ${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp ${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp +${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideosink_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index 3428cfc3f..79539c0ed 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -14,6 +14,10 @@ <enum-type name="VolumeScale"/> </namespace-type> + <namespace-type name="QtVideo" since="6.7"> + <enum-type name="Rotation"/> + </namespace-type> + <value-type name="QAudioBuffer"> <add-function signature="data()" return-type="PyBuffer"> <inject-code file="../glue/qtmultimedia.cpp" snippet="qaudiobuffer-data"/> diff --git a/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt b/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt index 21974f92c..e7c8586e4 100644 --- a/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtNetwork/CMakeLists.txt @@ -18,6 +18,7 @@ ${QtNetwork_GEN_DIR}/qdnstextrecord_wrapper.cpp ${QtNetwork_GEN_DIR}/qhostaddress_wrapper.cpp ${QtNetwork_GEN_DIR}/qhostinfo_wrapper.cpp ${QtNetwork_GEN_DIR}/qhstspolicy_wrapper.cpp +${QtNetwork_GEN_DIR}/qhttpheaders_wrapper.cpp ${QtNetwork_GEN_DIR}/qhttpmultipart_wrapper.cpp ${QtNetwork_GEN_DIR}/qhttppart_wrapper.cpp ${QtNetwork_GEN_DIR}/qhttp2configuration_wrapper.cpp @@ -38,7 +39,10 @@ ${QtNetwork_GEN_DIR}/qnetworkproxyfactory_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkproxyquery_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkreply_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkrequest_wrapper.cpp +${QtNetwork_GEN_DIR}/qnetworkrequestfactory_wrapper.cpp ${QtNetwork_GEN_DIR}/qpassworddigestor_wrapper.cpp +${QtNetwork_GEN_DIR}/qrestaccessmanager_wrapper.cpp +${QtNetwork_GEN_DIR}/qrestreply_wrapper.cpp ${QtNetwork_GEN_DIR}/qssl_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslcertificate_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslcertificateextension_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml index fbbf7dfa8..80c4f75f8 100644 --- a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml +++ b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml @@ -80,6 +80,9 @@ <value-type name="QHstsPolicy"> <enum-type name="PolicyFlag" flags="PolicyFlags"/> </value-type> + <value-type name="QHttpHeaders" since="6.7"> + <enum-type name="WellKnownHeader"/> + </value-type> <object-type name="QHttpMultiPart"> <enum-type name="ContentType"/> </object-type> @@ -249,18 +252,154 @@ </value-type> <value-type name="QNetworkRequest"> <enum-type name="Attribute"/> - <enum-type name="LoadControl" since="4.7"/> - <enum-type name="Priority" since="4.7"/> + <enum-type name="LoadControl"/> + <enum-type name="Priority"/> <enum-type name="CacheLoadControl"/> <enum-type name="KnownHeaders"/> <enum-type name="RedirectPolicy"/> <enum-type name="TransferTimeoutConstant"/> </value-type> - + <value-type name="QNetworkRequestFactory" since="6.7"/> <object-type name="QAbstractNetworkCache"/> <object-type name="QNetworkDiskCache"/> <value-type name="QNetworkCacheMetaData"/> + <object-type name="QRestAccessManager" since="6.7"> + <inject-code class="native" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-functor"/> + + <add-function signature="deleteResource(QNetworkRequest@request@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-callback"/> + </add-function> + + <add-function signature="get(QNetworkRequest@request@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-callback"/> + </add-function> + <add-function signature="get(QNetworkRequest@request@,QByteArray@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="get(QNetworkRequest@request@,QIODevice*@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="get(QNetworkRequest@request@,QJsonDocument@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + + <add-function signature="head(QNetworkRequest@request@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-callback"/> + </add-function> + + <add-function signature="patch(QNetworkRequest@request@,QByteArray@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="patch(QNetworkRequest@request@,QIODevice*@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="patch(QNetworkRequest@request@,QJsonDocument@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="patch(QNetworkRequest@request@,QVariantMap@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + + <add-function signature="post(QNetworkRequest@request@,QByteArray@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="post(QNetworkRequest@request@,QHttpMultiPart*@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="post(QNetworkRequest@request@,QIODevice*@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="post(QNetworkRequest@request@,QJsonDocument@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="post(QNetworkRequest@request@,QVariantMap@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + + <add-function signature="put(QNetworkRequest@request@,QByteArray@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="put(QNetworkRequest@request@,QHttpMultiPart*@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="put(QNetworkRequest@request@,QIODevice*@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="put(QNetworkRequest@request@,QJsonDocument@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + <add-function signature="put(QNetworkRequest@request@,QVariantMap@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-data-callback"/> + </add-function> + + <add-function signature="sendCustomRequest(QNetworkRequest@request@,QByteArray@method@,QByteArray@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-method-data-callback"/> + </add-function> + <add-function signature="sendCustomRequest(QNetworkRequest@request@,QByteArray@method@,QHttpMultiPart*@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-method-data-callback"/> + </add-function> + <add-function signature="sendCustomRequest(QNetworkRequest@request@,QByteArray@method@,QIODevice*@data@,QObject*@context@,PyCallable*@slot@)" + return-type="QNetworkReply*"> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestaccessmanager-method-data-callback"/> + </add-function> + </object-type> + + <object-type name="QRestReply" since="6.7"> + <add-function signature="readJson()" return-type="PyObject"> + <modify-argument index="return" + pyi-type="Tuple[Optional[PySide6.QtCore.QJsonDocument],PySide6.QtCore.QJsonParseError]"/> + <inject-code class="target" position="beginning" file="../glue/qtnetwork.cpp" + snippet="qrestreply-readjson"/> + </add-function> + </object-type> + <object-type name="QSctpServer"> <configuration condition="QT_CONFIG(sctp)"/> </object-type> diff --git a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt index 497d31818..93b1b52b2 100644 --- a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt @@ -32,6 +32,8 @@ ${QtQuick_GEN_DIR}/qsharedpointer_qquickitemgrabresult_wrapper.cpp ${QtQuick_GEN_DIR}/qquickpainteditem_wrapper.cpp ${QtQuick_GEN_DIR}/qquickrendercontrol_wrapper.cpp ${QtQuick_GEN_DIR}/qquickrendertarget_wrapper.cpp +${QtQuick_GEN_DIR}/qquickrhiitemrenderer_wrapper.cpp +${QtQuick_GEN_DIR}/qquickrhiitem_wrapper.cpp ${QtQuick_GEN_DIR}/qquicktextdocument_wrapper.cpp ${QtQuick_GEN_DIR}/qquickview_wrapper.cpp ${QtQuick_GEN_DIR}/qquickwindow_wrapper.cpp @@ -59,6 +61,7 @@ ${QtQuick_GEN_DIR}/qsgrendernode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgsimplerectnode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgsimpletexturenode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgrendererinterface_wrapper.cpp +${QtQuick_GEN_DIR}/qsgtextnode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgtexture_wrapper.cpp ${QtQuick_GEN_DIR}/qsgtexturematerial_wrapper.cpp ${QtQuick_GEN_DIR}/qsgtextureprovider_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml index a7f5ec492..446b164c8 100644 --- a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml +++ b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml @@ -75,6 +75,11 @@ <!-- TODO: Find a way to wrap `union ItemChangeData {}` --> </object-type> + <object-type name="QQuickRhiItemRenderer" since="6.7"/> + <object-type name="QQuickRhiItem" since="6.7"> + <enum-type name="TextureFormat"/> + </object-type> + <object-type name="QQuickItemGrabResult"/> <object-type name="QQuickPaintedItem"> @@ -89,7 +94,9 @@ <modify-function signature="^fromVulkanImage\(.*$" remove="all"/> </value-type> - <object-type name="QQuickTextDocument"/> + <object-type name="QQuickTextDocument"> + <enum-type name="Status" since="6.7"/> + </object-type> <object-type name="QQuickView"> <enum-type name="ResizeMode"/> @@ -181,6 +188,10 @@ <object-type name="QSGSimpleTextureNode"> <enum-type name="TextureCoordinatesTransformFlag" flags="TextureCoordinatesTransformMode"/> </object-type> + <object-type name="QSGTextNode" since="6.7"> + <enum-type name="TextStyle"/> + <enum-type name="RenderType"/> + </object-type> <object-type name="QSGRectangleNode"/> <object-type name="QSGRendererInterface"> <enum-type name="GraphicsApi"/> diff --git a/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt b/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt index b98a1dd1e..3d173c7ea 100644 --- a/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtQuick3D/CMakeLists.txt @@ -11,6 +11,7 @@ ${QtQuick3D_GEN_DIR}/qquick3dgeometry_attribute_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dgeometry_targetattribute_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dinstancing_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dinstancing_instancetableentry_wrapper.cpp +${QtQuick3D_GEN_DIR}/qquick3drenderextension_wrapper.cpp ${QtQuick3D_GEN_DIR}/qquick3dtexturedata_wrapper.cpp # module is always needed ${QtQuick3D_GEN_DIR}/qtquick3d_module_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml b/sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml index 274272bc2..753c35384 100644 --- a/sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml +++ b/sources/pyside6/PySide6/QtQuick3D/typesystem_quick3d.xml @@ -25,4 +25,5 @@ <object-type name="QQuick3DTextureData"> <enum-type name="Format"/> </object-type> + <object-type name="QQuick3DRenderExtension" since="6.7"/> </typesystem> diff --git a/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt b/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt index f61bddf8a..a96af846f 100644 --- a/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtRemoteObjects/CMakeLists.txt @@ -15,7 +15,7 @@ ${QtRemoteObjects_GEN_DIR}/qremoteobjectpendingcallwatcher_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectregistry_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectregistryhost_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectreplica_wrapper.cpp -# ${QtRemoteObjects_GEN_DIR}/qtremoteobjects_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qtremoteobjects_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectsettingsstore_wrapper.cpp ${QtRemoteObjects_GEN_DIR}/qremoteobjectsourcelocationinfo_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml b/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml index dd442cba4..ba12d05b8 100644 --- a/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml +++ b/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml @@ -9,13 +9,11 @@ <rejection class="QRemoteObjectStringLiterals"/> <rejection class="*" function-name="getTypeNameAndMetaobjectFromClassInfo"/> -<!-- Exclude namespace due to Q_NAMESPACE link errors on Windows (QTBUG-68014) <rejection class="QtRemoteObjects" field-name="staticMetaObject"/> <namespace-type name="QtRemoteObjects"> <enum-type name="InitialAction"/> <enum-type name="QRemoteObjectPacketTypeEnum"/> </namespace-type> ---> <object-type name="QAbstractItemModelReplica"/> <object-type name="QRemoteObjectAbstractPersistedStore"/> <object-type name="QRemoteObjectDynamicReplica"/> diff --git a/sources/pyside6/PySide6/QtSvg/CMakeLists.txt b/sources/pyside6/PySide6/QtSvg/CMakeLists.txt index 60be42cbf..a867df620 100644 --- a/sources/pyside6/PySide6/QtSvg/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtSvg/CMakeLists.txt @@ -6,6 +6,7 @@ project(QtSvg) set(QtSvg_SRC ${QtSvg_GEN_DIR}/qsvggenerator_wrapper.cpp ${QtSvg_GEN_DIR}/qsvgrenderer_wrapper.cpp +${QtSvg_GEN_DIR}/qtsvg_wrapper.cpp # module is always needed ${QtSvg_GEN_DIR}/qtsvg_module_wrapper.cpp ) diff --git a/sources/pyside6/PySide6/QtSvg/typesystem_svg.xml b/sources/pyside6/PySide6/QtSvg/typesystem_svg.xml index 834d8101b..47ac20174 100644 --- a/sources/pyside6/PySide6/QtSvg/typesystem_svg.xml +++ b/sources/pyside6/PySide6/QtSvg/typesystem_svg.xml @@ -7,6 +7,9 @@ <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> <object-type name="QSvgRenderer"/> + <namespace-type name="QtSvg" since="6.7"> + <enum-type name="Option" flags="Options"/> + </namespace-type> <object-type name="QSvgGenerator"> <enum-type name="SvgVersion" since="6.5"/> diff --git a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt index 3f376fd48..951974c66 100644 --- a/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWebEngineCore/CMakeLists.txt @@ -8,14 +8,17 @@ ${QtWebEngineCore_GEN_DIR}/qwebenginecertificateerror_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginecontextmenurequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginecookiestore_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginecookiestore_filterrequest_wrapper.cpp +# FIXME ${QtWebEngineCore_GEN_DIR}/qwebenginedesktopmediarequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginedownloadrequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginefilesystemaccessrequest_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebenginefindtextresult_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginefullscreenrequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginehistory_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginehistoryitem_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginehistorymodel_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginehttprequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineloadinginfo_wrapper.cpp +# FIXME ${QtWebEngineCore_GEN_DIR}/qwebenginemediasourcemodel_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginenewwindowrequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginenotification_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginepage_wrapper.cpp @@ -25,12 +28,13 @@ ${QtWebEngineCore_GEN_DIR}/qwebengineregisterprotocolhandlerrequest_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginescript_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginescriptcollection_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebenginesettings_wrapper.cpp -${QtWebEngineCore_GEN_DIR}/qwebenginefindtextresult_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestinfo_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestinterceptor_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestjob_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlscheme_wrapper.cpp ${QtWebEngineCore_GEN_DIR}/qwebengineurlschemehandler_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebenginewebauthpinrequest_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebenginewebauthuxrequest_wrapper.cpp # module is always needed ${QtWebEngineCore_GEN_DIR}/qtwebenginecore_module_wrapper.cpp ) diff --git a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml index ff88b3584..5548fe697 100644 --- a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml +++ b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml @@ -147,6 +147,18 @@ <object-type name="QWebEngineUrlSchemeHandler"/> + <!-- FIXME not in snapshot yet + <value-type name="QWebEngineDesktopMediaRequest" since="6.7"/> + <object-type name="QWebEngineMediaSourceModel" since="6.7"/> + --> + <value-type name="QWebEngineWebAuthPinRequest" since="6.7"/> + <object-type name="QWebEngineWebAuthUxRequest" since="6.7"> + <enum-type name="WebAuthUxState"/> + <enum-type name="PinEntryReason"/> + <enum-type name="PinEntryError"/> + <enum-type name="RequestFailureReason"/> + </object-type> + <!-- QtQml is pulled in via QtWebEngineCoreDepends. --> <suppress-warning text="^Scoped enum 'QQml.*' does not have a type entry.*$"/> diff --git a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt index 3ce30d469..0a731030b 100644 --- a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt @@ -116,6 +116,7 @@ ${QtWidgets_GEN_DIR}/qprogressdialog_wrapper.cpp ${QtWidgets_GEN_DIR}/qproxystyle_wrapper.cpp ${QtWidgets_GEN_DIR}/qpushbutton_wrapper.cpp ${QtWidgets_GEN_DIR}/qradiobutton_wrapper.cpp +${QtWidgets_GEN_DIR}/qrhiwidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qrubberband_wrapper.cpp ${QtWidgets_GEN_DIR}/qscrollarea_wrapper.cpp ${QtWidgets_GEN_DIR}/qscrollbar_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml index 956dedbb0..0891ad5b3 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_common.xml @@ -43,6 +43,8 @@ <function signature="qDrawWinPanel(QPainter*,const QRect&,const QPalette&,bool,const QBrush*)"/> <function signature="qDrawPlainRect(QPainter*,int,int,int,int,const QColor&,int,const QBrush*)"/> <function signature="qDrawPlainRect(QPainter*,const QRect&,const QColor&,int,const QBrush*)"/> + <function signature="qDrawPlainRoundedRect(QPainter*,int,int,int,int,qreal,qreal,const QColor&,int,const QBrush*)" since="6.7"/> + <function signature="qDrawPlainRoundedRect(QPainter*,const QRect&,qreal,qreal,const QColor&,int,const QBrush *)" since="6.7"/> <object-type name="QStyleOption" polymorphic-id-expression="%1->type == QStyleOption::SO_Default" polymorphic-name-function="styleOptionType"> @@ -3345,6 +3347,12 @@ <object-type name="QPinchGesture" since="4.6"> <enum-type name="ChangeFlag" flags="ChangeFlags"/> </object-type> + + <object-type name="QRhiWidget" since="6.7"> + <enum-type name="Api"/> + <enum-type name="TextureFormat"/> + </object-type> + <object-type name="QSwipeGesture" since="4.6"> <enum-type name="SwipeDirection"/> </object-type> diff --git a/sources/pyside6/PySide6/glue/qtnetwork.cpp b/sources/pyside6/PySide6/glue/qtnetwork.cpp index f00780b40..4e021711d 100644 --- a/sources/pyside6/PySide6/glue/qtnetwork.cpp +++ b/sources/pyside6/PySide6/glue/qtnetwork.cpp @@ -58,3 +58,65 @@ quint8 item = %CONVERTTOCPP[quint8](_value); %CPPSELF.c[_i] = item; return 0; // @snippet qipv6address-setitem + +// @snippet qrestaccessmanager-functor +class QRestFunctor +{ +public: + explicit QRestFunctor(PyObject *callable) noexcept : m_callable(callable) + { + Py_INCREF(callable); + } + + void operator()(QRestReply &restReply); + +private: + PyObject *m_callable; +}; + +void QRestFunctor::operator()(QRestReply &restReply) +{ + Q_ASSERT(m_callable); + Shiboken::GilState state; + Shiboken::AutoDecRef arglist(PyTuple_New(1)); + auto *restReplyPtr = &restReply; + auto *pyRestReply = %CONVERTTOPYTHON[QRestReply*](restReplyPtr); + PyTuple_SET_ITEM(arglist.object(), 0, pyRestReply); + Shiboken::AutoDecRef ret(PyObject_CallObject(m_callable, arglist)); + Py_DECREF(m_callable); + m_callable = nullptr; +} +// @snippet qrestaccessmanager-functor + +// @snippet qrestaccessmanager-callback +auto *networkReply = %CPPSELF.%FUNCTION_NAME(%1, %2, QRestFunctor(%PYARG_3)); +%PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](networkReply); +// @snippet qrestaccessmanager-callback + +// @snippet qrestaccessmanager-data-callback +auto *networkReply = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, QRestFunctor(%PYARG_4)); +%PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](networkReply); +// @snippet qrestaccessmanager-data-callback + +// @snippet qrestaccessmanager-method-data-callback +auto *networkReply = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, QRestFunctor(%PYARG_5)); +%PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](networkReply); +// @snippet qrestaccessmanager-method-data-callback + +// @snippet qrestreply-readjson +QJsonParseError jsonParseError; +std::optional<QJsonDocument> documentOptional = %CPPSELF.%FUNCTION_NAME(&jsonParseError); + +PyObject *pyDocument{}; +if (documentOptional.has_value()) { + const auto &document = documentOptional.value(); + pyDocument = %CONVERTTOPYTHON[QJsonDocument](document); +} else { + pyDocument = Py_None; + Py_INCREF(Py_None); +} + +%PYARG_0 = PyTuple_New(2); +PyTuple_SetItem(%PYARG_0, 0, pyDocument); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QJsonParseError](jsonParseError)); +// @snippet qrestreply-readjson |