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

Updated QtNetwork typesystem to support Qt 4.7

Browse source
This commit is contained in:
Renato Filho 2010-05-21 20:18:41 -03:00
commit c2b2e579ae
5 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -73,9 +73,15 @@ elseif(Q_WS_WIN)
else() else()
message(FATAL_ERROR "OS not supported") message(FATAL_ERROR "OS not supported")
endif() endif()
message(STATUS "Detected OS: ${AUTO_OS}") message(STATUS "Detected OS: ${AUTO_OS}")
# Define supported Qt Version
if(${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
set(SUPPORTED_QT_VERSION 4.7)
else()
set(SUPPORTED_QT_VERSION 4.6)
endif()
set(BINDING_VERSION ${BINDING_API_VERSION}.${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}) set(BINDING_VERSION ${BINDING_API_VERSION}.${QT_VERSION_MAJOR}.${QT_VERSION_MINOR})
find_program(GENERATOR generatorrunner REQUIRED) find_program(GENERATOR generatorrunner REQUIRED)

18
PySide/QtNetwork/CMakeLists.txt
View file

@ -47,12 +47,15 @@ else()
message(FATAL_ERROR "OS not supported") message(FATAL_ERROR "OS not supported")
endif(Q_WS_X11) endif(Q_WS_X11)
if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
set (QtNetwork_46_SRC ) 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() else()
set(QtNetwork_46_SRC set(QtNetwork_47_SRC )
) endif ()
endif (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
set(QtNetwork_SRC set(QtNetwork_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qabstractsocket_wrapper.cpp ${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/qudpsocket_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qurlinfo_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qurlinfo_wrapper.cpp
${SPECIFIC_OS_FILES} ${SPECIFIC_OS_FILES}
${QtNetwork_46_SRC} ${QtNetwork_47_SRC}
) )
set(OPENSSL_SOURCES set(OPENSSL_SOURCES
@ -95,6 +98,9 @@ set(OPENSSL_SOURCES
CHECK_QT_NETWORK_MACRO("Network OPENSSL" QT_NO_OPENSSL OPENSSL_SOURCES QtNetwork_SRC) 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_BINARY_DIR}:${QtCore_SOURCE_DIR}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}

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

@ -1,7 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<typesystem package="PySide.QtNetwork"> <typesystem package="PySide.QtNetwork">
<load-typesystem name="typesystem_core.xml" generate="no" />
<namespace-type name="QSsl"> <namespace-type name="QSsl">
<extra-includes> <extra-includes>
<include file-name="qssl.h" location="global"/> <include file-name="qssl.h" location="global"/>

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

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

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

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