From c2b2e579ae58562e620224e1b82cd199edab248b Mon Sep 17 00:00:00 2001
From: Renato Filho <renato.filho@openbossa.org>
Date: Fri, 21 May 2010 20:18:41 -0300
Subject: Updated QtNetwork typesystem to support Qt 4.7

---
 CMakeLists.txt                              |   8 +-
 PySide/QtNetwork/CMakeLists.txt             |  18 +-
 PySide/QtNetwork/typesystem_network-4.6.xml | 264 +++++++++++++++++++++++++++
 PySide/QtNetwork/typesystem_network-4.7.xml |  21 +++
 PySide/QtNetwork/typesystem_network.xml     | 266 ----------------------------
 PySide/QtNetwork/typesystem_network.xml.in  |   5 +
 6 files changed, 309 insertions(+), 273 deletions(-)
 create mode 100644 PySide/QtNetwork/typesystem_network-4.6.xml
 create mode 100644 PySide/QtNetwork/typesystem_network-4.7.xml
 delete mode 100644 PySide/QtNetwork/typesystem_network.xml
 create mode 100644 PySide/QtNetwork/typesystem_network.xml.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c686246c..02ac03655 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,9 +73,15 @@ elseif(Q_WS_WIN)
 else()
     message(FATAL_ERROR "OS not supported")
 endif()
-
 message(STATUS "Detected OS: ${AUTO_OS}")
 
+# Define supported Qt Version
+if(${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
+    set(SUPPORTED_QT_VERSION 4.7)
+else()
+    set(SUPPORTED_QT_VERSION 4.6)
+endif()
+
 set(BINDING_VERSION ${BINDING_API_VERSION}.${QT_VERSION_MAJOR}.${QT_VERSION_MINOR})
 find_program(GENERATOR generatorrunner REQUIRED)
 
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt
index 5c4cb1ea8..9d660e4d4 100644
--- a/PySide/QtNetwork/CMakeLists.txt
+++ b/PySide/QtNetwork/CMakeLists.txt
@@ -47,12 +47,15 @@ else()
     message(FATAL_ERROR "OS not supported")
 endif(Q_WS_X11)
 
-if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
-    set (QtNetwork_46_SRC )
+if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
+    set (QtNetwork_47_SRC
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkconfiguration_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkconfigurationmanager_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworksession_wrapper.cpp
+    )
 else()
-    set(QtNetwork_46_SRC
-       )
-endif (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
+    set(QtNetwork_47_SRC )
+endif ()
 
 set(QtNetwork_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qabstractsocket_wrapper.cpp
@@ -82,7 +85,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qtnetwork_module_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qudpsocket_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qurlinfo_wrapper.cpp
 ${SPECIFIC_OS_FILES}
-${QtNetwork_46_SRC}
+${QtNetwork_47_SRC}
 )
 
 set(OPENSSL_SOURCES
@@ -95,6 +98,9 @@ set(OPENSSL_SOURCES
 
 CHECK_QT_NETWORK_MACRO("Network OPENSSL" QT_NO_OPENSSL OPENSSL_SOURCES QtNetwork_SRC)
 
+configure_file(typesystem_network.xml.in
+               "${CMAKE_CURRENT_BINARY_DIR}/typesystem_network.xml" @ONLY)
+
 execute_generator(network QtNetwork_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/PySide/QtNetwork/typesystem_network-4.6.xml b/PySide/QtNetwork/typesystem_network-4.6.xml
new file mode 100644
index 000000000..d9c3e7f34
--- /dev/null
+++ b/PySide/QtNetwork/typesystem_network-4.6.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0"?>
+<typesystem package="PySide.QtNetwork">
+    <namespace-type name="QSsl">
+        <extra-includes>
+            <include file-name="qssl.h" location="global"/>
+        </extra-includes>
+    </namespace-type>
+
+    <rejection class="QIPv6Address" field-name="c"/>
+    <rejection class="QSslCertificate"/>
+    <enum-type name="QAbstractSocket::NetworkLayerProtocol"/>
+    <enum-type name="QAbstractSocket::SocketError"/>
+    <enum-type name="QAbstractSocket::SocketOption"/>
+    <enum-type name="QAbstractSocket::SocketState"/>
+    <enum-type name="QAbstractSocket::SocketType"/>
+    <enum-type name="QFtp::Command"/>
+    <enum-type name="QFtp::Error"/>
+    <enum-type name="QFtp::State"/>
+    <enum-type name="QFtp::TransferMode"/>
+    <enum-type name="QFtp::TransferType"/>
+    <enum-type name="QHostAddress::SpecialAddress"/>
+    <enum-type name="QHttp::Error"/>
+    <enum-type name="QHttp::State"/>
+    <enum-type name="QHttp::ConnectionMode"/>
+    <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/>
+    <enum-type name="QNetworkProxy::Capability"/>
+    <enum-type name="QNetworkProxy::ProxyType"/>
+    <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode"/>
+    <enum-type name="QUrlInfo::PermissionSpec"/>
+    <enum-type name="QHostInfo::HostInfoError"/>
+    <enum-type name="QSsl::KeyType"/>
+    <enum-type name="QSsl::EncodingFormat"/>
+    <enum-type name="QSsl::KeyAlgorithm"/>
+    <enum-type name="QSsl::AlternateNameEntryType"/>
+    <enum-type name="QSsl::SslProtocol"/>
+    <enum-type name="QLocalSocket::LocalSocketError"/>
+    <enum-type name="QLocalSocket::LocalSocketState"/>
+    <enum-type name="QNetworkAccessManager::Operation"/>
+    <enum-type name="QNetworkCookie::RawForm"/>
+    <enum-type name="QNetworkReply::NetworkError"/>
+    <enum-type name="QNetworkRequest::Attribute" extensible="yes"/>
+    <enum-type name="QNetworkRequest::CacheLoadControl"/>
+    <enum-type name="QNetworkRequest::KnownHeaders"/>
+
+    <object-type name="QAbstractSocket">
+        <modify-function signature="connectToHost(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
+        <modify-function signature="connectToHost(const QHostAddress&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
+        <modify-function signature="disconnectFromHost()" allow-thread="yes" />
+        <modify-function signature="waitForConnected(int)" allow-thread="yes" />
+        <modify-function signature="waitForDisconnected(int)" allow-thread="yes" />
+    </object-type>
+
+    <object-type name="QFtp">
+        <modify-function signature="connectToHost(const QString&amp;, quint16)" allow-thread="yes" />
+        <modify-function signature="login(const QString&amp;, const QString&amp;)" allow-thread="yes" />
+        <modify-function signature="close()" allow-thread="yes" />
+        <modify-function signature="list(const QString&amp;)" allow-thread="yes" />
+        <modify-function signature="cd(const QString&amp;)" allow-thread="yes" />
+        <modify-function signature="get(const QString&amp;, QIODevice*, QFtp::TransferType)" allow-thread="yes" />
+        <modify-function signature="put(const QByteArray&amp;, const QString&amp;, QFtp::TransferType)" allow-thread="yes" />
+        <modify-function signature="put(QIODevice*, const QString&amp;, QFtp::TransferType)" allow-thread="yes" />
+        <modify-function signature="remove(const QString&amp;)" allow-thread="yes" />
+        <modify-function signature="mkdir(const QString&amp;)" allow-thread="yes" />
+        <modify-function signature="rmdir(const QString&amp;)" allow-thread="yes" />
+        <modify-function signature="rename(const QString&amp;, const QString&amp;)" allow-thread="yes" />
+        <modify-function signature="rawCommand(const QString&amp;)" allow-thread="yes" />
+        <modify-function signature="readAll()" allow-thread="yes" />
+        <modify-function signature="read(char*, qint64)" allow-thread="yes">
+          <modify-argument index="return">
+            <replace-type modified-type="QByteArray"/>
+          </modify-argument>
+          <modify-argument index="1">
+            <remove-argument />
+          </modify-argument>
+          <inject-code class="target" position="beginning">
+            <insert-template name="read_wrapper"/>
+          </inject-code>
+        </modify-function>
+    </object-type>
+
+    <object-type name="QHttp">
+        <modify-function signature="closeConnection()" remove="all"/>
+        <modify-function signature="readAll()" allow-thread="yes"/>
+        <modify-function signature="read(char*, qint64)" allow-thread="yes">
+          <modify-argument index="return">
+            <replace-type modified-type="QByteArray"/>
+          </modify-argument>
+          <modify-argument index="1">
+            <remove-argument />
+          </modify-argument>
+          <inject-code class="target" position="beginning">
+            <insert-template name="read_wrapper"/>
+          </inject-code>
+        </modify-function>
+    </object-type>
+    <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 -->
+            <modify-argument index="1">
+                <remove-default-expression/>
+            </modify-argument>
+            <modify-argument index="2">
+                <remove-default-expression/>
+                <remove-argument/>
+            </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="PyTuple*"/>
+            </modify-argument>
+            <inject-code class="target" position="beginning">
+                <insert-template name="fix_args,bool*"/>
+            </inject-code>
+        </modify-function>
+    </object-type>
+    <object-type name="QTcpSocket"/>
+    <object-type name="QUdpSocket">
+        <modify-function signature="readDatagram(char*, qint64, QHostAddress*, quint16*)" allow-thread="yes">
+            <modify-argument index="1">
+                <remove-argument/>
+            </modify-argument>
+            <modify-argument index="3">
+                <remove-default-expression/>
+                <remove-argument/>
+            </modify-argument>
+            <modify-argument index="4">
+                <remove-default-expression/>
+                <remove-argument/>
+            </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="PyTuple*"/>
+            </modify-argument>
+            <inject-code class="target" position="beginning" file="glue/qudpsocket_read_datagram_glue.cpp"/>
+        </modify-function>
+        <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&amp;,quint16)" remove="all"/>
+        <modify-function signature="writeDatagram(const QByteArray&amp;, const QHostAddress&amp;, quint16)" allow-thread="yes"/>
+    </object-type>
+
+    <object-type name="QHttpHeader">
+        <modify-function signature="operator=(QHttpHeader)" remove="all"/>
+
+        <modify-function signature="QHttpHeader(QHttpHeader)" remove="all"/>
+    </object-type>
+    <object-type name="QLocalServer">
+        <modify-function signature="waitForNewConnection(int,bool*)" allow-thread="yes">
+            <!-- FIXME -->
+            <modify-argument index="1">
+                <remove-default-expression/>
+            </modify-argument>
+            <modify-argument index="2">
+                <remove-default-expression/>
+                <remove-argument/>
+            </modify-argument>
+            <inject-code class="target" position="beginning">
+                <insert-template name="fix_args,bool*"/>
+            </inject-code>
+            <modify-argument index="return">
+                <replace-type modified-type="PyTuple*"/>
+            </modify-argument>
+
+        </modify-function>
+    </object-type>
+    <object-type name="QLocalSocket"/>
+    <object-type name="QNetworkAccessManager">
+        <modify-function signature="setCookieJar(QNetworkCookieJar*)">
+            <modify-argument index="1">
+                <define-ownership class="target" owner="c++"/>
+            </modify-argument>
+        </modify-function>
+    </object-type>
+    <object-type name="QNetworkCookieJar"/>
+    <object-type name="QNetworkReply"/>
+
+    <value-type name="QHostAddress" hash-function="qHash">
+        <modify-function signature="QHostAddress(quint8*)" remove="all" />
+        <modify-function signature="operator=(QString)" remove="all"/>
+        <modify-function signature="operator=(QHostAddress)" remove="all"/>
+    </value-type>
+
+    <value-type name="QHostInfo">
+        <modify-function signature="operator=(QHostInfo)" remove="all"/>
+        <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/>
+    </value-type>
+
+    <value-type name="QHttpRequestHeader">
+        <modify-function signature="operator=(QHttpRequestHeader)" remove="all"/>
+    </value-type>
+
+    <value-type name="QHttpResponseHeader">
+        <modify-function signature="operator=(QHttpResponseHeader)" remove="all"/>
+    </value-type>
+
+    <value-type name="QNetworkAddressEntry">
+        <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/>
+    </value-type>
+
+    <value-type name="QNetworkInterface">
+        <modify-function signature="operator=(QNetworkInterface)" remove="all"/>
+    </value-type>
+
+    <value-type name="QNetworkProxy">
+        <modify-function signature="operator=(QNetworkProxy)" remove="all"/>
+    </value-type>
+
+    <value-type name="QUrlInfo">
+        <modify-function signature="operator=(QUrlInfo)" remove="all"/>
+    </value-type>
+
+    <value-type name="QIPv6Address">
+        <modify-function signature="operator[](int)const">
+            <remove/>
+        </modify-function>
+        <modify-function signature="operator[](int)">
+            <remove/>
+        </modify-function>
+    </value-type>
+
+    <value-type name="QAuthenticator">
+        <modify-function signature="operator=(QAuthenticator)" remove="all"/>
+    </value-type>
+    <value-type name="QNetworkCookie">
+        <modify-function signature="operator=(QNetworkCookie)" remove="all"/>
+
+        <extra-includes>
+            <include file-name="QDateTime" location="global"/>
+        </extra-includes>
+    </value-type>
+    <value-type name="QNetworkRequest">
+        <modify-function signature="operator=(QNetworkRequest)" remove="all"/>
+    </value-type>
+
+    <enum-type name="QSslError::SslError"/>
+    <enum-type name="QSslCertificate::SubjectInfo"/>
+    <enum-type name="QSslSocket::SslMode"/>
+    <enum-type name="QSslSocket::PeerVerifyMode"/>
+
+    <value-type name="QSslCipher"/>
+    <value-type name="QSslError"/>
+    <value-type name="QSslKey"/>
+    <!-- TODO QSslCertificate requires QMultiMap which isn't implemented yet
+    <value-type name="QSslCertificate"/>
+    -->
+    <value-type name="QSslConfiguration"/>
+
+    <object-type name="QSslSocket">
+        <modify-function signature="connectToHostEncrypted(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
+        <modify-function signature="waitForEncrypted(int)" allow-thread="yes" />
+    </object-type>
+
+    <suppress-warning text="Shadowing: QAbstractSocket::*"/>
+
+    <!-- For people building without SSL support -->
+    <!--
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslError' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslCipher' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslKey' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslError' for enum 'SslError' is not declared"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslCertificate' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'PeerVerifyMode' is not declared"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslCertificate' for enum 'SubjectInfo' is not declared"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslConfiguration' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslSocket' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    -->
+
+</typesystem>
diff --git a/PySide/QtNetwork/typesystem_network-4.7.xml b/PySide/QtNetwork/typesystem_network-4.7.xml
new file mode 100644
index 000000000..b518f0f66
--- /dev/null
+++ b/PySide/QtNetwork/typesystem_network-4.7.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<typesystem package="PySide.QtNetwork">
+    <load-typesystem name="typesystem_core.xml" generate="no" />
+    <load-typesystem name="typesystem_network-4.6.xml" generate="yes" />
+
+    <enum-type name="QNetworkConfiguration::Purpose"/>
+    <enum-type name="QNetworkConfiguration::StateFlag" flags="QNetworkConfiguration::StateFlags"/>
+    <enum-type name="QNetworkConfiguration::Type"/>
+    <enum-type name="QNetworkConfigurationManager::Capability" flags="QNetworkConfigurationManager::Capabilities"/>
+    <enum-type name="QNetworkSession::SessionError"/>
+    <enum-type name="QNetworkSession::State"/>
+    <enum-type name="QNetworkAccessManager::NetworkAccessibility"/>
+    <enum-type name="QNetworkRequest::Priority"/>
+    <enum-type name="QNetworkRequest::LoadControl"/>
+
+
+    <value-type name="QNetworkConfiguration"/>
+    <object-type name="QNetworkConfigurationManager"/>
+    <object-type name="QNetworkSession"/>
+
+</typesystem>
diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml
deleted file mode 100644
index b52b72f03..000000000
--- a/PySide/QtNetwork/typesystem_network.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0"?>
-<typesystem package="PySide.QtNetwork">
-    <load-typesystem name="typesystem_core.xml" generate="no" />
-
-    <namespace-type name="QSsl">
-        <extra-includes>
-            <include file-name="qssl.h" location="global"/>
-        </extra-includes>
-    </namespace-type>
-
-    <rejection class="QIPv6Address" field-name="c"/>
-    <rejection class="QSslCertificate"/>
-    <enum-type name="QAbstractSocket::NetworkLayerProtocol"/>
-    <enum-type name="QAbstractSocket::SocketError"/>
-    <enum-type name="QAbstractSocket::SocketOption"/>
-    <enum-type name="QAbstractSocket::SocketState"/>
-    <enum-type name="QAbstractSocket::SocketType"/>
-    <enum-type name="QFtp::Command"/>
-    <enum-type name="QFtp::Error"/>
-    <enum-type name="QFtp::State"/>
-    <enum-type name="QFtp::TransferMode"/>
-    <enum-type name="QFtp::TransferType"/>
-    <enum-type name="QHostAddress::SpecialAddress"/>
-    <enum-type name="QHttp::Error"/>
-    <enum-type name="QHttp::State"/>
-    <enum-type name="QHttp::ConnectionMode"/>
-    <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/>
-    <enum-type name="QNetworkProxy::Capability"/>
-    <enum-type name="QNetworkProxy::ProxyType"/>
-    <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode"/>
-    <enum-type name="QUrlInfo::PermissionSpec"/>
-    <enum-type name="QHostInfo::HostInfoError"/>
-    <enum-type name="QSsl::KeyType"/>
-    <enum-type name="QSsl::EncodingFormat"/>
-    <enum-type name="QSsl::KeyAlgorithm"/>
-    <enum-type name="QSsl::AlternateNameEntryType"/>
-    <enum-type name="QSsl::SslProtocol"/>
-    <enum-type name="QLocalSocket::LocalSocketError"/>
-    <enum-type name="QLocalSocket::LocalSocketState"/>
-    <enum-type name="QNetworkAccessManager::Operation"/>
-    <enum-type name="QNetworkCookie::RawForm"/>
-    <enum-type name="QNetworkReply::NetworkError"/>
-    <enum-type name="QNetworkRequest::Attribute" extensible="yes"/>
-    <enum-type name="QNetworkRequest::CacheLoadControl"/>
-    <enum-type name="QNetworkRequest::KnownHeaders"/>
-
-    <object-type name="QAbstractSocket">
-        <modify-function signature="connectToHost(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
-        <modify-function signature="connectToHost(const QHostAddress&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
-        <modify-function signature="disconnectFromHost()" allow-thread="yes" />
-        <modify-function signature="waitForConnected(int)" allow-thread="yes" />
-        <modify-function signature="waitForDisconnected(int)" allow-thread="yes" />
-    </object-type>
-
-    <object-type name="QFtp">
-        <modify-function signature="connectToHost(const QString&amp;, quint16)" allow-thread="yes" />
-        <modify-function signature="login(const QString&amp;, const QString&amp;)" allow-thread="yes" />
-        <modify-function signature="close()" allow-thread="yes" />
-        <modify-function signature="list(const QString&amp;)" allow-thread="yes" />
-        <modify-function signature="cd(const QString&amp;)" allow-thread="yes" />
-        <modify-function signature="get(const QString&amp;, QIODevice*, QFtp::TransferType)" allow-thread="yes" />
-        <modify-function signature="put(const QByteArray&amp;, const QString&amp;, QFtp::TransferType)" allow-thread="yes" />
-        <modify-function signature="put(QIODevice*, const QString&amp;, QFtp::TransferType)" allow-thread="yes" />
-        <modify-function signature="remove(const QString&amp;)" allow-thread="yes" />
-        <modify-function signature="mkdir(const QString&amp;)" allow-thread="yes" />
-        <modify-function signature="rmdir(const QString&amp;)" allow-thread="yes" />
-        <modify-function signature="rename(const QString&amp;, const QString&amp;)" allow-thread="yes" />
-        <modify-function signature="rawCommand(const QString&amp;)" allow-thread="yes" />
-        <modify-function signature="readAll()" allow-thread="yes" />
-        <modify-function signature="read(char*, qint64)" allow-thread="yes">
-          <modify-argument index="return">
-            <replace-type modified-type="QByteArray"/>
-          </modify-argument>
-          <modify-argument index="1">
-            <remove-argument />
-          </modify-argument>
-          <inject-code class="target" position="beginning">
-            <insert-template name="read_wrapper"/>
-          </inject-code>
-        </modify-function>
-    </object-type>
-
-    <object-type name="QHttp">
-        <modify-function signature="closeConnection()" remove="all"/>
-        <modify-function signature="readAll()" allow-thread="yes"/>
-        <modify-function signature="read(char*, qint64)" allow-thread="yes">
-          <modify-argument index="return">
-            <replace-type modified-type="QByteArray"/>
-          </modify-argument>
-          <modify-argument index="1">
-            <remove-argument />
-          </modify-argument>
-          <inject-code class="target" position="beginning">
-            <insert-template name="read_wrapper"/>
-          </inject-code>
-        </modify-function>
-    </object-type>
-    <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 -->
-            <modify-argument index="1">
-                <remove-default-expression/>
-            </modify-argument>
-            <modify-argument index="2">
-                <remove-default-expression/>
-                <remove-argument/>
-            </modify-argument>
-            <modify-argument index="return">
-                <replace-type modified-type="PyTuple*"/>
-            </modify-argument>
-            <inject-code class="target" position="beginning">
-                <insert-template name="fix_args,bool*"/>
-            </inject-code>
-        </modify-function>
-    </object-type>
-    <object-type name="QTcpSocket"/>
-    <object-type name="QUdpSocket">
-        <modify-function signature="readDatagram(char*, qint64, QHostAddress*, quint16*)" allow-thread="yes">
-            <modify-argument index="1">
-                <remove-argument/>
-            </modify-argument>
-            <modify-argument index="3">
-                <remove-default-expression/>
-                <remove-argument/>
-            </modify-argument>
-            <modify-argument index="4">
-                <remove-default-expression/>
-                <remove-argument/>
-            </modify-argument>
-            <modify-argument index="return">
-                <replace-type modified-type="PyTuple*"/>
-            </modify-argument>
-            <inject-code class="target" position="beginning" file="glue/qudpsocket_read_datagram_glue.cpp"/>
-        </modify-function>
-        <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&amp;,quint16)" remove="all"/>
-        <modify-function signature="writeDatagram(const QByteArray&amp;, const QHostAddress&amp;, quint16)" allow-thread="yes"/>
-    </object-type>
-
-    <object-type name="QHttpHeader">
-        <modify-function signature="operator=(QHttpHeader)" remove="all"/>
-
-        <modify-function signature="QHttpHeader(QHttpHeader)" remove="all"/>
-    </object-type>
-    <object-type name="QLocalServer">
-        <modify-function signature="waitForNewConnection(int,bool*)" allow-thread="yes">
-            <!-- FIXME -->
-            <modify-argument index="1">
-                <remove-default-expression/>
-            </modify-argument>
-            <modify-argument index="2">
-                <remove-default-expression/>
-                <remove-argument/>
-            </modify-argument>
-            <inject-code class="target" position="beginning">
-                <insert-template name="fix_args,bool*"/>
-            </inject-code>
-            <modify-argument index="return">
-                <replace-type modified-type="PyTuple*"/>
-            </modify-argument>
-
-        </modify-function>
-    </object-type>
-    <object-type name="QLocalSocket"/>
-    <object-type name="QNetworkAccessManager">
-        <modify-function signature="setCookieJar(QNetworkCookieJar*)">
-            <modify-argument index="1">
-                <define-ownership class="target" owner="c++"/>
-            </modify-argument>
-        </modify-function>
-    </object-type>
-    <object-type name="QNetworkCookieJar"/>
-    <object-type name="QNetworkReply"/>
-
-    <value-type name="QHostAddress" hash-function="qHash">
-        <modify-function signature="QHostAddress(quint8*)" remove="all" />
-        <modify-function signature="operator=(QString)" remove="all"/>
-        <modify-function signature="operator=(QHostAddress)" remove="all"/>
-    </value-type>
-
-    <value-type name="QHostInfo">
-        <modify-function signature="operator=(QHostInfo)" remove="all"/>
-        <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/>
-    </value-type>
-
-    <value-type name="QHttpRequestHeader">
-        <modify-function signature="operator=(QHttpRequestHeader)" remove="all"/>
-    </value-type>
-
-    <value-type name="QHttpResponseHeader">
-        <modify-function signature="operator=(QHttpResponseHeader)" remove="all"/>
-    </value-type>
-
-    <value-type name="QNetworkAddressEntry">
-        <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/>
-    </value-type>
-
-    <value-type name="QNetworkInterface">
-        <modify-function signature="operator=(QNetworkInterface)" remove="all"/>
-    </value-type>
-
-    <value-type name="QNetworkProxy">
-        <modify-function signature="operator=(QNetworkProxy)" remove="all"/>
-    </value-type>
-
-    <value-type name="QUrlInfo">
-        <modify-function signature="operator=(QUrlInfo)" remove="all"/>
-    </value-type>
-
-    <value-type name="QIPv6Address">
-        <modify-function signature="operator[](int)const">
-            <remove/>
-        </modify-function>
-        <modify-function signature="operator[](int)">
-            <remove/>
-        </modify-function>
-    </value-type>
-
-    <value-type name="QAuthenticator">
-        <modify-function signature="operator=(QAuthenticator)" remove="all"/>
-    </value-type>
-    <value-type name="QNetworkCookie">
-        <modify-function signature="operator=(QNetworkCookie)" remove="all"/>
-
-        <extra-includes>
-            <include file-name="QDateTime" location="global"/>
-        </extra-includes>
-    </value-type>
-    <value-type name="QNetworkRequest">
-        <modify-function signature="operator=(QNetworkRequest)" remove="all"/>
-    </value-type>
-
-    <enum-type name="QSslError::SslError"/>
-    <enum-type name="QSslCertificate::SubjectInfo"/>
-    <enum-type name="QSslSocket::SslMode"/>
-    <enum-type name="QSslSocket::PeerVerifyMode"/>
-
-    <value-type name="QSslCipher"/>
-    <value-type name="QSslError"/>
-    <value-type name="QSslKey"/>
-    <!-- TODO QSslCertificate requires QMultiMap which isn't implemented yet
-    <value-type name="QSslCertificate"/>
-    -->
-    <value-type name="QSslConfiguration"/>
-
-    <object-type name="QSslSocket">
-        <modify-function signature="connectToHostEncrypted(const QString&amp;, quint16, QFlags&lt;QIODevice::OpenModeFlag>)" allow-thread="yes" />
-        <modify-function signature="waitForEncrypted(int)" allow-thread="yes" />
-    </object-type>
-
-    <suppress-warning text="Shadowing: QAbstractSocket::*"/>
-
-    <!-- For people building without SSL support -->
-    <!--
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared"/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslError' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslCipher' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslKey' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslError' for enum 'SslError' is not declared"/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslCertificate' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'PeerVerifyMode' is not declared"/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslCertificate' for enum 'SubjectInfo' is not declared"/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslConfiguration' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslSocket' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-    -->
-
-</typesystem>
diff --git a/PySide/QtNetwork/typesystem_network.xml.in b/PySide/QtNetwork/typesystem_network.xml.in
new file mode 100644
index 000000000..86262c30e
--- /dev/null
+++ b/PySide/QtNetwork/typesystem_network.xml.in
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<typesystem package="PySide.QtGui">
+  <load-typesystem name="typesystem_core.xml" generate="no"/>
+  <load-typesystem name="typesystem_network-@SUPPORTED_QT_VERSION@.xml" generate="yes"/>
+</typesystem>
-- 
cgit v1.2.3