From ceeb82693a0240b1dd4f51605ba21413927ee558 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 19 May 2020 11:55:10 +0200
Subject: Initial port of Core,Gui,Widgets,Network,Qml,Quick to Qt 6

Test failures:
  shiboken2:testmodifyfunction
  pyside2:QtCore::qbytearray_test
  pyside2:QtGui::bug_PYSIDE-41
  pyside2:QtGui::deepcopy_test
  pyside2:QtGui::qfontmetrics_test
  pyside2:QtGui::qpixmapcache_test
  pyside2:QtWidgets::api2_test (QTBUG-85417)
  pyside2:QtWidgets::bug_632
  pyside2:QtWidgets::bug_714
  pyside2:QtWidgets::bug_785
  pyside2:QtWidgets::qshortcut_test
  pyside2:QtQml::bug_825
  pyside2:QtQml::bug_1029
  pyside2:QtQml::registertype
  pyside2:QtQml::qqmlincubator_incubateWhile
  pyside2:QtQml::signal_arguments

Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ia43d7ed037dfdd07def0edd76bada2243e73d335
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 .../pyside2/PySide2/QtNetwork/typesystem_network.xml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'sources/pyside2/PySide2/QtNetwork/typesystem_network.xml')

diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
index dc60a509d..f078b9bf7 100644
--- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
+++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
@@ -42,6 +42,8 @@
 <typesystem package="PySide2.QtNetwork">
   <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/>
 
+    <rejection class="dtlsopenssl"/>
+
     <enum-type name="QDtlsError" since="5.12"/>
     <enum-type name="QOcspCertificateStatus" since="5.13"/>
     <enum-type name="QOcspRevocationReason" since="5.13"/>
@@ -53,6 +55,8 @@
     </namespace-type>
 
     <namespace-type name="QSsl">
+        <enum-type name="AlertLevel" since="6.0"/>
+        <enum-type name="AlertType" since="6.0"/>
         <enum-type name="AlternativeNameEntryType"/>
         <enum-type name="EncodingFormat"/>
         <enum-type name="KeyAlgorithm"/>
@@ -172,7 +176,6 @@
         <enum-type name="LocalSocketState"/>
     </object-type>
     <object-type name="QNetworkAccessManager">
-        <enum-type name="NetworkAccessibility" since="4.7"/>
         <enum-type name="Operation"/>
         <modify-function signature="createRequest(QNetworkAccessManager::Operation,const QNetworkRequest&amp;,QIODevice*)">
           <modify-argument index="3" invalidate-after-use="yes"/>
@@ -262,21 +265,6 @@
         <enum-type name="TransferTimeoutConstant" since="5.15"/>
     </value-type>
 
-    <value-type name="QNetworkConfiguration" since="4.7">
-        <enum-type name="BearerType"/>
-        <enum-type name="Purpose" since="4.7"/>
-        <enum-type name="StateFlag" flags="StateFlags" since="4.7"/>
-        <enum-type name="Type" since="4.7"/>
-    </value-type>
-    <object-type name="QNetworkConfigurationManager" since="4.7">
-        <enum-type name="Capability" flags="Capabilities" since="4.7"/>
-    </object-type>
-    <object-type name="QNetworkSession" since="4.7">
-        <enum-type name="SessionError" since="4.7"/>
-        <enum-type name="State" since="4.7"/>
-        <enum-type name="UsagePolicy" flags="UsagePolicies"/>
-    </object-type>
-
     <object-type name="QAbstractNetworkCache"/>
     <object-type name="QNetworkDiskCache"/>
     <value-type name="QNetworkCacheMetaData"/>
-- 
cgit v1.2.3