diff options
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtNetwork/CMakeLists.txt | 18 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network-4.6.xml (renamed from PySide/QtNetwork/typesystem_network.xml) | 2 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network-4.7.xml | 21 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network.xml.in | 5 |
4 files changed, 38 insertions, 8 deletions
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.xml b/PySide/QtNetwork/typesystem_network-4.6.xml index b52b72f03..d9c3e7f34 100644 --- a/PySide/QtNetwork/typesystem_network.xml +++ b/PySide/QtNetwork/typesystem_network-4.6.xml @@ -1,7 +1,5 @@ <?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"/> 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.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> |