diff options
author | Renato Filho <renato.filho@openbossa.org> | 2010-05-25 17:45:59 -0300 |
---|---|---|
committer | Renato Filho <renato.filho@openbossa.org> | 2010-05-26 16:24:07 -0300 |
commit | 2264c8874cc2939217745ad9d0daa47e770e9578 (patch) | |
tree | ce1023ce66627b29ff62c22102db8672470a59fc /PySide/QtNetwork | |
parent | 893946b5727dfa3489bc3d2fa411fd24fd3d8ff7 (diff) |
Merged typesystem (Qt 4.6 and 4.7)
Start use "since" tag on typesystem to Qt 4.7 modifications.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>,
Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'PySide/QtNetwork')
-rw-r--r-- | PySide/QtNetwork/CMakeLists.txt | 5 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network-4.7.xml | 21 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network.xml (renamed from PySide/QtNetwork/typesystem_network-4.6.xml) | 31 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network.xml.in | 5 |
4 files changed, 18 insertions, 44 deletions
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt index 9d660e4d4..e66fa3724 100644 --- a/PySide/QtNetwork/CMakeLists.txt +++ b/PySide/QtNetwork/CMakeLists.txt @@ -98,10 +98,7 @@ 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}") +execute_generator(network QtNetwork_SRC "${CMAKE_CURRENT_SOURCE_DIR}:${QtCore_SOURCE_DIR}") include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/ diff --git a/PySide/QtNetwork/typesystem_network-4.7.xml b/PySide/QtNetwork/typesystem_network-4.7.xml deleted file mode 100644 index b518f0f66..000000000 --- a/PySide/QtNetwork/typesystem_network-4.7.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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-4.6.xml b/PySide/QtNetwork/typesystem_network.xml index d9c3e7f34..d3f330eba 100644 --- a/PySide/QtNetwork/typesystem_network-4.6.xml +++ b/PySide/QtNetwork/typesystem_network.xml @@ -1,5 +1,7 @@ <?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"/> @@ -245,20 +247,21 @@ <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."/> - --> + <!-- Qt 4.7 --> + <enum-type name="QNetworkConfiguration::Purpose" since="4.7"/> + <enum-type name="QNetworkConfiguration::StateFlag" flags="QNetworkConfiguration::StateFlags" since="4.7"/> + <enum-type name="QNetworkConfiguration::Type" since="4.7"/> + <enum-type name="QNetworkConfigurationManager::Capability" flags="QNetworkConfigurationManager::Capabilities" since="4.7"/> + <enum-type name="QNetworkSession::SessionError" since="4.7"/> + <enum-type name="QNetworkSession::State" since="4.7"/> + <enum-type name="QNetworkAccessManager::NetworkAccessibility" since="4.7"/> + <enum-type name="QNetworkRequest::Priority" since="4.7"/> + <enum-type name="QNetworkRequest::LoadControl" since="4.7"/> + <value-type name="QNetworkConfiguration" since="4.7"/> + <object-type name="QNetworkConfigurationManager" since="4.7"/> + <object-type name="QNetworkSession" since="4.7"/> + + <suppress-warning text="Shadowing: QAbstractSocket::*"/> </typesystem> diff --git a/PySide/QtNetwork/typesystem_network.xml.in b/PySide/QtNetwork/typesystem_network.xml.in deleted file mode 100644 index 86262c30e..000000000 --- a/PySide/QtNetwork/typesystem_network.xml.in +++ /dev/null @@ -1,5 +0,0 @@ -<?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> |