aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-05-12 12:15:51 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-05-12 14:20:18 +0000
commite2958f37979fcf4ff336b9d7256930ba33a47471 (patch)
treeb00ab4648336478f99006970cad3299f53da2237
parent4f4337fa127682619c98f51052a3b05160a51c4e (diff)
PySide6: Fix some generation warnings about enums
Some modules pull in QtNetwork/QtQml via their Depends headers although it is only a private/link dependency. Suppress warnings about the enums. Change-Id: I35d75ca538bb770294e434b83233600462805e99 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit fd422712c7ac7d3833112476757f815fe905a9b5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml4
-rw-r--r--sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml4
-rw-r--r--sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml4
-rw-r--r--sources/pyside6/PySide6/QtLocation/typesystem_location.xml4
-rw-r--r--sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml2
-rw-r--r--sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml3
-rw-r--r--sources/pyside6/PySide6/QtWebChannel/typesystem_webchannel.xml3
-rw-r--r--sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml3
8 files changed, 27 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
index 28a11bdeb..f8fbe2317 100644
--- a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
+++ b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
@@ -76,4 +76,8 @@
<!-- reject Qt enum helper functions in Qt3D namespaces -->
<rejection class="^Qt3D.*$" function-name="^qt_getEnum.*$"/>
+
+ <!-- QtNetwork is pulled in via QtBluetoothDepends. -->
+ <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls).*' does not have a type entry.*$"/>
+
</typesystem>
diff --git a/sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml b/sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml
index bbebe3b03..737305bbd 100644
--- a/sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml
+++ b/sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml
@@ -112,4 +112,8 @@
<value-type name="QLowEnergyServiceData">
<enum-type name="ServiceType"/>
</value-type>
+
+ <!-- QtNetwork is pulled in via QtBluetoothDepends. -->
+ <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls).*' does not have a type entry.*$"/>
+
</typesystem>
diff --git a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml
index 50ea5ed22..3df435c45 100644
--- a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml
+++ b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml
@@ -468,4 +468,8 @@
<extra-includes>
<include file-name="qutils.h" location="global"/>
</extra-includes>
+
+ <!-- QtQml/QtNetwork are pulled in via QtDataVisualizationDepends. -->
+ <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls)|(Qml).*' does not have a type entry.*$"/>
+
</typesystem>
diff --git a/sources/pyside6/PySide6/QtLocation/typesystem_location.xml b/sources/pyside6/PySide6/QtLocation/typesystem_location.xml
index 51c4b697e..a44896cdb 100644
--- a/sources/pyside6/PySide6/QtLocation/typesystem_location.xml
+++ b/sources/pyside6/PySide6/QtLocation/typesystem_location.xml
@@ -74,4 +74,8 @@
</object-type>
<object-type name="QPlaceSearchSuggestionReply"/>
<value-type name="QPlaceSupplier"/>
+
+ <!-- QtQml, QtNetwork are pulled in via QtLocationDepends. -->
+ <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls)|(Qml).*' does not have a type entry.*$"/>
+
</typesystem>
diff --git a/sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml b/sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml
index be9465901..91d6119c4 100644
--- a/sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml
+++ b/sources/pyside6/PySide6/QtNfc/typesystem_nfc.xml
@@ -28,4 +28,6 @@
<enum-type name="Error"/>
<enum-type name="Type"/>
</object-type>
+ <!-- QtNetwork is pulled in via QtNfcDepends. -->
+ <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls).*' does not have a type entry.*$"/>
</typesystem>
diff --git a/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml b/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml
index 852a3e836..1894a8bc6 100644
--- a/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml
+++ b/sources/pyside6/PySide6/QtRemoteObjects/typesystem_remoteobjects.xml
@@ -43,4 +43,7 @@
<suppress-warning text="^QRemoteObjectPendingCallWatcher inherits from a non polymorphic type.*$"/>
<suppress-warning text="Enum 'QRemoteObjectReplica::ConstructorType' (class: QRemoteObjectReplica) does not have a type entry"/>
<suppress-warning text="skipping field 'QRemoteObjectReplica::d_impl' with unmatched type 'QSharedPointer'"/>
+ <!-- QtNetwork is pulled in via QtRemoteObjectsDepends. -->
+ <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls).*' does not have a type entry.*$"/>
+
</typesystem>
diff --git a/sources/pyside6/PySide6/QtWebChannel/typesystem_webchannel.xml b/sources/pyside6/PySide6/QtWebChannel/typesystem_webchannel.xml
index a4c209bfc..75a51853f 100644
--- a/sources/pyside6/PySide6/QtWebChannel/typesystem_webchannel.xml
+++ b/sources/pyside6/PySide6/QtWebChannel/typesystem_webchannel.xml
@@ -16,4 +16,7 @@
the QML module is not yet wrapped.
<object-type name="QQmlWebChannel"/> -->
+ <!-- QtQml/QtNetwork are pulled in via QtQtWebChannelDepends. -->
+ <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls)|(Qml).*' does not have a type entry.*$"/>
+
</typesystem>
diff --git a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml
index cacc2d21d..ff88b3584 100644
--- a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml
+++ b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml
@@ -147,4 +147,7 @@
<object-type name="QWebEngineUrlSchemeHandler"/>
+ <!-- QtQml is pulled in via QtWebEngineCoreDepends. -->
+ <suppress-warning text="^Scoped enum 'QQml.*' does not have a type entry.*$"/>
+
</typesystem>