diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-09-21 10:08:04 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-09-21 13:02:58 +0200 |
commit | 71e2d660aa090f656007d7da2022bd08debeb926 (patch) | |
tree | 58e29a509d45ef2c3ba118a502bd5ad680c5e12f | |
parent | aaf3a48f544a40b75de2272f33fab512d85f6469 (diff) |
PySide6: API Adaptions for 6.2
Add missing enum QLocalSocket::SocketOption and remove
obsolete enums and functions.
Task-number: PYSIDE-1570
Change-Id: I2d89e116d2360fd49dac0343acf1e85d2442e5e1
Reviewed-by: Christian Tismer <tismer@stackless.com>
4 files changed, 1 insertions, 4 deletions
diff --git a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml index 6db64f877..ffe3fd958 100644 --- a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml +++ b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml @@ -43,7 +43,6 @@ <typesystem package="PySide6.Qt3DCore"> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> <namespace-type name="Qt3DCore" generate-using="no"> - <enum-type name="ChangeFlag" flags="ChangeFlags"/> <object-type name="QAbstractAspect"/> <object-type name="QAbstractFunctor" since="6.0"/> <object-type name="QAbstractSkeleton" since="5.10"/> diff --git a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml index 40a598436..0a9e69521 100644 --- a/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml +++ b/sources/pyside6/PySide6/QtNetwork/typesystem_network.xml @@ -180,6 +180,7 @@ </object-type> <object-type name="QLocalSocket"> <enum-type name="LocalSocketError"/> + <enum-type name="SocketOption" flags="SocketOptions"/> <enum-type name="LocalSocketState"/> </object-type> <object-type name="QNetworkAccessManager"> diff --git a/sources/pyside6/PySide6/QtSerialPort/typesystem_serialport.xml b/sources/pyside6/PySide6/QtSerialPort/typesystem_serialport.xml index a27221038..06b04856b 100644 --- a/sources/pyside6/PySide6/QtSerialPort/typesystem_serialport.xml +++ b/sources/pyside6/PySide6/QtSerialPort/typesystem_serialport.xml @@ -44,7 +44,6 @@ <object-type name="QSerialPort"> <enum-type name="BaudRate"/> <enum-type name="DataBits"/> - <enum-type name="DataErrorPolicy"/> <enum-type name="Direction" flags="Directions"/> <enum-type name="FlowControl"/> <enum-type name="Parity"/> diff --git a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml index cee7602c5..5072ddfb4 100644 --- a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml +++ b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml @@ -105,8 +105,6 @@ <object-type name="QWebEngineProfile"> <enum-type name="HttpCacheType"/> <enum-type name="PersistentCookiesPolicy"/> - <!-- FIXME Left-over deprecated API, pending fix in qtwebengine repo --> - <modify-function signature="setRequestInterceptor(QWebEngineUrlRequestInterceptor*)" remove="all"/> </object-type> <object-type name="QWebEngineNewWindowRequest"> |