jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged typesystem (Qt 4.6 and 4.7)

Browse source 
Start use "since" tag on typesystem to Qt 4.7 modifications.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>,
          Marcelo Lira <marcelo.lira@openbossa.org>
This commit is contained in:
Renato Filho 2010-05-25 17:45:59 -03:00
commit 2264c8874c
9 changed files with 39 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PySide/QtNetwork/CMakeLists.txt
View file

@ -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/

21
PySide/QtNetwork/typesystem_network-4.7.xml
View file

@ -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>

33
PySide/QtNetwork/typesystem_network-4.6.xml → PySide/QtNetwork/typesystem_network.xml
View file

@ -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>
<!-- 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::*"/>
<!-- 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>

5
PySide/QtNetwork/typesystem_network.xml.in
View file

@ -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>