Merge remote-tracking branch 'origin/5.9' into 5.11

Change-Id: Ic7aa7796dffda87ef492a99af7859c909ec607a2

3 files changed, 54 insertions, 2 deletions

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 1e239f38b..77d074077 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -394,8 +394,9 @@
             double in = %CONVERTTOCPP[double](%in);
             %out = %OUTTYPE(in);
             </add-conversion>
-            <add-conversion type="PyInt">
-            int in = %CONVERTTOCPP[int](%in);
+            <!-- Using PyLong instead of PyInt to support Python2 and 3-->
+            <add-conversion type="PyInt" check="PyInt_CheckExact(%in)">
+            qlonglong in = %CONVERTTOCPP[qlonglong](%in);
             %out = %OUTTYPE(in);
             </add-conversion>
             <add-conversion type="PyLong" check="PyLong_CheckExact(%in)">
diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt
index 68037017d..0267bfae3 100644
--- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt
@@ -4,18 +4,35 @@ set(QtNetwork_OPTIONAL_SRC )
 set(QtNetwork_DROPPED_ENTRIES )
 
 check_qt_class(QtNetwork QSslCertificate    QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSslCertificateExtension QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
 check_qt_class(QtNetwork QSslCipher         QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
 check_qt_class(QtNetwork QSslConfiguration  QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSslDiffieHellmanParameters QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+# Problems with operator==(QSslEllipticCurve,QSslEllipticCurve)
+# check_qt_class(QtNetwork QSslEllipticCurve QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
 check_qt_class(QtNetwork QSslError          QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
 check_qt_class(QtNetwork QSslKey            QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSslPreSharedKeyAuthenticator QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
 check_qt_class(QtNetwork QSslSocket         QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
 
+check_qt_class(QtNetwork QSctpServer        QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+check_qt_class(QtNetwork QSctpSocket        QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
+
 set(QtNetwork_SRC
 ${QtNetwork_GEN_DIR}/qabstractnetworkcache_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qabstractsocket_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qauthenticator_wrapper.cpp
+${QtNetwork_GEN_DIR}/qdnsdomainnamerecord_wrapper.cpp
+${QtNetwork_GEN_DIR}/qdnshostaddressrecord_wrapper.cpp
+${QtNetwork_GEN_DIR}/qdnslookup_wrapper.cpp
+${QtNetwork_GEN_DIR}/qdnsmailexchangerecord_wrapper.cpp
+${QtNetwork_GEN_DIR}/qdnsservicerecord_wrapper.cpp
+${QtNetwork_GEN_DIR}/qdnstextrecord_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qhostaddress_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qhostinfo_wrapper.cpp
+${QtNetwork_GEN_DIR}/qhstspolicy_wrapper.cpp
+${QtNetwork_GEN_DIR}/qhttpmultipart_wrapper.cpp
+${QtNetwork_GEN_DIR}/qhttppart_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qipv6address_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qlocalserver_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qlocalsocket_wrapper.cpp
@@ -26,6 +43,7 @@ ${QtNetwork_GEN_DIR}/qnetworkconfiguration_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qnetworkconfigurationmanager_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qnetworkcookie_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qnetworkcookiejar_wrapper.cpp
+${QtNetwork_GEN_DIR}/qnetworkdatagram_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qnetworkdiskcache_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qnetworkinterface_wrapper.cpp
 ${QtNetwork_GEN_DIR}/qnetworkproxy_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
index 18c3b28bc..e4235e070 100644
--- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
+++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml
@@ -71,6 +71,22 @@
         <modify-function signature="waitForDisconnected(int)" allow-thread="yes" />
     </object-type>
 
+    <value-type name="QDnsDomainNameRecord"/>
+    <value-type name="QDnsHostAddressRecord"/>
+    <object-type name="QDnsLookup">
+        <enum-type name="Error"/>
+        <enum-type name="Type"/>
+    </object-type>
+    <value-type name="QDnsMailExchangeRecord"/>
+    <value-type name="QDnsServiceRecord"/>
+    <value-type name="QDnsTextRecord"/>
+    <value-type name="QHstsPolicy" since="5.9">
+        <enum-type name="PolicyFlag" flags="PolicyFlags"/>
+    </value-type>
+    <object-type name="QHttpMultiPart">
+        <enum-type name="ContentType"/>
+    </object-type>
+    <value-type name="QHttpPart" since="5.9"/>
     <object-type name="QTcpServer">
         <modify-function signature="waitForNewConnection(int,bool*)" allow-thread="yes">
             <!-- FIXME removing default expression means user will always have to pass a value, but he wouldn't have to -->
@@ -172,6 +188,7 @@
         </modify-function>
     </object-type>
     <object-type name="QNetworkCookieJar"/>
+    <value-type name="QNetworkDatagram" since="5.8"/>
     <object-type name="QNetworkReply">
         <enum-type name="NetworkError"/>
     </object-type>
@@ -285,17 +302,30 @@
     <object-type name="QNetworkDiskCache"/>
     <value-type name="QNetworkCacheMetaData"/>
 
+    <object-type name="QSctpServer"/>
+    <object-type name="QSctpSocket"/>
+
     <!-- The following entries may be present in the system or not. Keep this section organized. -->
     <value-type name="QSslCertificate">
         <enum-type name="SubjectInfo"/>
     </value-type>
 
+    <value-type name="QSslCertificateExtension"/>
+
     <value-type name="QSslCipher"/>
 
     <value-type name="QSslConfiguration">
         <enum-type name="NextProtocolNegotiationStatus" />
     </value-type>
 
+    <value-type name="QSslDiffieHellmanParameters" since="5.8">
+        <enum-type name="Error"/>
+    </value-type>
+
+    <!-- Problems with operator==(QSslEllipticCurve,QSslEllipticCurve)
+    <object-type name="QSslEllipticCurve"/>
+    -->
+
     <value-type name="QSslError">
         <enum-type name="SslError"/>
     </value-type>
@@ -307,6 +337,9 @@
         <modify-function signature="connectToHostEncrypted(const QString&amp;,quint16,QFlags&lt;QIODevice::OpenModeFlag>,QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" />
         <modify-function signature="waitForEncrypted(int)" allow-thread="yes" />
     </object-type>
+
+    <value-type name="QSslPreSharedKeyAuthenticator"/>
+
     <!-- The above entries may be present in the system or not. Keep this section organized. -->
 </typesystem>