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

Separated class typesystem from the main typesystem.

Browse source 
Remove class specification,  detected during the compilation from the
main typesystem to avoid errors during the generation.

Fixes bug #661

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Araujo Oliveira Filho 2011-02-08 11:57:59 -03:00 • committed by Hugo Parente Lima
commit 811e37c378
24 changed files with 149 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

18
PySide/QtNetwork/CMakeLists.txt
View file

@ -46,12 +46,16 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qurlinfo_wrapper.cpp
${QtNetwork_47_SRC}
)
check_qt_class(QtNetwork QSslCertificate QtNetwork_SRC)
check_qt_class(QtNetwork QSslCipher QtNetwork_SRC)
check_qt_class(QtNetwork QSslConfiguration QtNetwork_SRC)
check_qt_class(QtNetwork QSslError QtNetwork_SRC)
check_qt_class(QtNetwork QSslKey QtNetwork_SRC)
check_qt_class(QtNetwork QSslSocket QtNetwork_SRC)
set(TARGET_TYPESYSTEM "${CMAKE_CURRENT_BINARY_DIR}/typesystem_network.xml")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_network.xml"
"${TARGET_TYPESYSTEM}" @ONLY)
check_qt_class(QtNetwork QSslCertificate QtNetwork_SRC ${TARGET_TYPESYSTEM})
check_qt_class(QtNetwork QSslCipher QtNetwork_SRC ${TARGET_TYPESYSTEM})
check_qt_class(QtNetwork QSslConfiguration QtNetwork_SRC ${TARGET_TYPESYSTEM})
check_qt_class(QtNetwork QSslError QtNetwork_SRC ${TARGET_TYPESYSTEM})
check_qt_class(QtNetwork QSslKey QtNetwork_SRC ${TARGET_TYPESYSTEM})
check_qt_class(QtNetwork QSslSocket QtNetwork_SRC ${TARGET_TYPESYSTEM})
set(QtNetwork_typesystem_path "${QtCore_SOURCE_DIR}")
set(QtNetwork_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
@ -75,4 +79,4 @@ create_pyside_module(QtNetwork
QtNetwork_deps
QtNetwork_typesystem_path
QtNetwork_SRC
"")
${TARGET_TYPESYSTEM})

1
PySide/QtNetwork/optional/QSslCertificate.xml Normal file
View file

@ -0,0 +1 @@
<value-type name="QSslCertificate"/>

1
PySide/QtNetwork/optional/QSslCipher.xml Normal file
View file

@ -0,0 +1 @@
<value-type name="QSslCipher"/>

1
PySide/QtNetwork/optional/QSslConfiguration.xml Normal file
View file

@ -0,0 +1 @@
<value-type name="QSslConfiguration"/>

4
PySide/QtNetwork/optional/QSslError.xml Normal file
View file

@ -0,0 +1,4 @@
<value-type name="QSslError">
<enum-type name="SslError"/>
</value-type>

1
PySide/QtNetwork/optional/QSslKey.xml Normal file
View file

@ -0,0 +1 @@
<value-type name="QSslKey"/>

6
PySide/QtNetwork/optional/QSslSocket.xml Normal file
View file

@ -0,0 +1,6 @@
<object-type name="QSslSocket">
<enum-type name="SslMode"/>
<enum-type name="PeerVerifyMode"/>
<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>

18
PySide/QtNetwork/typesystem_network.xml
View file

@ -34,7 +34,6 @@
<rejection class="QIPv6Address" field-name="c"/>
<value-type name="QSslCertificate"/>
<object-type name="QAbstractSocket">
<enum-type name="NetworkLayerProtocol"/>
<enum-type name="SocketError"/>
@ -256,28 +255,11 @@
<enum-type name="KnownHeaders"/>
</value-type>
<value-type name="QSslCipher"/>
<value-type name="QSslError">
<enum-type name="SslError"/>
</value-type>
<value-type name="QSslKey"/>
<!-- TODO QSslCertificate requires QMultiMap which isn't implemented yet
<value-type name="QSslCertificate"/>
-->
<enum-type name="QSslCertificate::SubjectInfo"/>
<value-type name="QSslConfiguration"/>
<object-type name="QSslSocket">
<enum-type name="SslMode"/>
<enum-type name="PeerVerifyMode"/>
<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>
<!-- Qt 4.7 -->
<value-type name="QNetworkConfiguration" since="4.7">
<enum-type name="BearerType" />