diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-17 09:21:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-17 09:13:19 +0000 |
| commit | 3e252bba6ea6b96acb412d08131953e74d2b84ee (patch) | |
| tree | 5ed2d2677e2793871cc78666aed26ba99b1c04f1 /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
| parent | f440ebfd838d0b754bbba38fbbd2ccf5318f7347 (diff) | |
Fix build of qtbase modules
Adapt to qtbase/2f9a294252ae44defd4d8ae1b3c09d8e36ee0612:
- Removal of deprecated QSettings API
- Changed signature of QLineF
- Change of QVariant constructors
- Introduction of new QIODeviceBase class
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I834f535af3c977164def12fc86dfd87282c240aa
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index d43c5a29b..4b567b7d7 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -748,7 +748,7 @@ </insert-template> </inject-code> </add-function> - <modify-function signature="intersect(QLineF,QPointF*)const"> + <modify-function signature="intersect(const QLineF &,QPointF*)const"> <modify-argument index="2"> <remove-argument /> </modify-argument> @@ -2129,8 +2129,8 @@ <modify-function signature="flush()" allow-thread="yes"/> </object-type> <object-type name="QFile"> - <modify-function signature="open(QFlags<QIODevice::OpenModeFlag>)" allow-thread="yes"/> - <modify-function signature="open(int,QFlags<QIODevice::OpenModeFlag>,QFlags<QFileDevice::FileHandleFlag>)" allow-thread="yes"/> + <modify-function signature="open(QFlags<QIODeviceBase::OpenModeFlag>)" allow-thread="yes"/> + <modify-function signature="open(int,QFlags<QIODeviceBase::OpenModeFlag>,QFlags<QFileDevice::FileHandleFlag>)" allow-thread="yes"/> <modify-function signature="copy(const QString&)" allow-thread="yes"/> <modify-function signature="copy(const QString&,const QString&)" allow-thread="yes"/> <modify-function signature="link(const QString&)" allow-thread="yes"/> @@ -2144,8 +2144,7 @@ <object-type name="QFileSelector"/> <object-type name="QIODevice"> - <enum-type name="OpenModeFlag" flags="OpenMode"/> - <modify-function signature="open(QFlags<QIODevice::OpenModeFlag>)" allow-thread="yes"/> + <modify-function signature="open(QFlags<QIODeviceBase::OpenModeFlag>)" allow-thread="yes"/> <modify-function signature="close()" allow-thread="yes"/> <modify-function signature="seek(qint64)" allow-thread="yes"/> <modify-function signature="readAll()" allow-thread="yes"/> @@ -2192,6 +2191,9 @@ <inject-code class="native" position="end" file="../glue/qtcore.cpp" snippet="return-readData"/> </modify-function> </object-type> + <value-type name="QIODeviceBase" since="6.0"> + <enum-type name="OpenModeFlag" flags="OpenMode"/> + </value-type> <object-type name="QCryptographicHash"> <enum-type name="Algorithm"/> <modify-function signature="addData(const char*,qsizetype)"> @@ -2434,9 +2436,6 @@ <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> - <!--### Obsolete in 4.3--> - <modify-function signature="setSystemIniPath(const QString&)" remove="all"/> - <modify-function signature="setUserIniPath(const QString&)" remove="all"/> <!-- PYSIDE-1010: We remove the original implementation of value() to include the optional parameter --> <modify-function signature="value(const QString&,const QVariant&)const" remove="all"/> @@ -2625,14 +2624,14 @@ <enum-type name="RealNumberNotation"/> <enum-type name="Status"/> <!-- Removed because it expect QString to be mutable --> - <modify-function signature="QTextStream(QString*,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> + <modify-function signature="QTextStream(QString*,QFlags<QIODeviceBase::OpenModeFlag>)" remove="all"/> <!-- Qt5.5: Removed because it expect QString to be mutable --> <modify-function signature="readLineInto(QString*,qint64)" since="5.5" remove="all"/> <!-- Removed because we use the non-const version --> - <modify-function signature="QTextStream(const QByteArray&,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> + <modify-function signature="QTextStream(const QByteArray&,QFlags<QIODeviceBase::OpenModeFlag>)" remove="all"/> <!-- Removed because it expect QString to be mutable --> - <modify-function signature="setString(QString*,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> + <modify-function signature="setString(QString*,QFlags<QIODeviceBase::OpenModeFlag>)" remove="all"/> <modify-function signature="operator<<(const void*)" remove="all"/> <modify-function signature="operator<<(float)" remove="all"/> |