aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-06-17 14:02:42 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-17 18:45:37 +0000
commitd41e3f95767bef7c266841e8d2613d8366ad3bc6 (patch)
tree9d6ca317fb6cd8eb20eb03e58e0df4d647a6f727
parent03776673aa3db70fd2222f5339dba3084d4502a9 (diff)
PySide6: Fix some shiboken warnings
sources/pyside6/PySide6/QtCore/typesystem_core_common.xml:3019: enum 'QJsonDocument::DataValidation' is specified in typesystem, but not declared. sources/pyside6/PySide6/QtCore/typesystem_core_common.xml:2353: signature 'lock()' for function modification in 'QMutex' not found. sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml:504: signature 'operator<<(QPointF)' for function modification in 'QPolygonF' not found. sources/pyside6/PySide6/QtQuick/typesystem_quick.xml:108: enum 'QQuickWindow::NativeObjectType' is specified in typesystem, but not declared. Change-Id: I2d36246c2b3df4b7a7a5678dd3eedf73601a85ef Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 4b0185393fa46bb1944877303b878c7f3be747ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/QtCore/typesystem_core_common.xml2
-rw-r--r--sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml2
-rw-r--r--sources/pyside6/PySide6/QtQuick/typesystem_quick.xml1
3 files changed, 0 insertions, 5 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
index 6345332a8..6d00b5e7f 100644
--- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
+++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml
@@ -2262,7 +2262,6 @@
</object-type>
<object-type name="QMutex">
- <modify-function signature="lock()" allow-thread="yes"/>
<modify-function signature="tryLock(int)" allow-thread="yes"/>
</object-type>
<object-type name="QRecursiveMutex" since="5.14">
@@ -2926,7 +2925,6 @@
</value-type>
<value-type name="QJsonDocument">
- <enum-type name="DataValidation"/>
<enum-type name="JsonFormat"/>
</value-type>
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
index ce546d9cc..534ccaaf6 100644
--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml
@@ -507,8 +507,6 @@
</extra-includes>
<!-- ### A QList parameter, for no defined type, will generate wrong code. -->
<modify-function signature="operator+=(QList&lt;QPointF&gt;)" remove="all"/>
- <!-- ### See bug 776 -->
- <modify-function signature="operator&lt;&lt;(QPointF)" remove="all"/>
<!-- ### See bug 777 -->
<modify-function signature="operator&lt;&lt;(QList&lt;QPointF&gt;)" remove="all"/>
<!-- ### -->
diff --git a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml
index 4b7825217..ee0b6a4ec 100644
--- a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml
+++ b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml
@@ -105,7 +105,6 @@
<object-type name="QQuickWindow">
<enum-type name="CreateTextureOption" flags="CreateTextureOptions"/>
- <enum-type name="NativeObjectType" since="5.14"/>
<enum-type name="RenderStage"/>
<enum-type name="SceneGraphError"/>
<enum-type name="TextRenderType" since="5.10"/>