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

Updated CMake files to use the "--drop-type-entries" generator option.

Browse source 
Instead of maintaining a complex CMake scheme to remove optional type
system entries, the generation will rely on the new generator capability
of dropping entries given via command line.

Reviewed by Bruno Araújo <bruno.araujo@openbossa.org>
Reviewed by Lauro Moura <lauro.neto@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
Marcelo Lira 2011-02-16 11:37:45 -03:00 • committed by Hugo Parente Lima
commit 75937124c2
42 changed files with 201 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

24
PySide/QtNetwork/CMakeLists.txt
View file

@ -10,6 +10,15 @@ else()
set(QtNetwork_47_SRC )
endif ()
set(QtNetwork_OPTIONAL_SRC )
set(QtNetwork_DROPPED_ENTRIES )
check_qt_class(QtNetwork QSslCertificate 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 QSslError QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
check_qt_class(QtNetwork QSslKey QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
check_qt_class(QtNetwork QSslSocket QtNetwork_OPTIONAL_SRC QtNetwork_DROPPED_ENTRIES)
set(QtNetwork_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qabstractnetworkcache_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qabstractsocket_wrapper.cpp
@ -44,19 +53,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qudpsocket_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qurlinfo_wrapper.cpp
${QtNetwork_47_SRC}
${QtNetwork_OPTIONAL_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}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/
@ -79,4 +78,5 @@ create_pyside_module(QtNetwork
QtNetwork_deps
QtNetwork_typesystem_path
QtNetwork_SRC
${TARGET_TYPESYSTEM})
""
QtNetwork_DROPPED_ENTRIES)

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

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

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

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

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

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

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

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

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

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

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

@ -1,6 +0,0 @@
<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>

19
PySide/QtNetwork/typesystem_network.xml
View file

@ -280,4 +280,23 @@
<value-type name="QNetworkCacheMetaData"/>
<suppress-warning text="Shadowing: QAbstractSocket::*"/>
<!-- The following entries may be present in the system or not. Keep this section organized. -->
<value-type name="QSslCertificate"/>
<value-type name="QSslCipher"/>
<value-type name="QSslConfiguration"/>
<value-type name="QSslError">
<enum-type name="SslError"/>
</value-type>
<value-type name="QSslKey"/>
<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>
<!-- The above entries may be present in the system or not. Keep this section organized. -->
</typesystem>