Merged typesystem (Qt 4.6 and 4.7)

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

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>,
          Marcelo Lira <marcelo.lira@openbossa.org>

9 files changed, 38 insertions, 47 deletions

diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
index 23e2dc4dc..3162cbb17 100644
--- a/PySide/CMakeLists.txt
+++ b/PySide/CMakeLists.txt
@@ -11,6 +11,7 @@ COMMAND ${GENERATOR} ${GENERATOR_EXTRA_FLAGS}
         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
         --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${module}.xml
+        --api-version=${SUPPORTED_QT_VERSION}
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for ${module}..."
 )
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 01cadfafb..757251919 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -26,6 +26,15 @@ else()
     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qvariantanimation_wrapper.cpp
     )
 endif()
+if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 7)
+    set (QtCore_47_SRC )
+else()
+    set(QtCore_47_SRC
+    ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qelapsedtimer_wrapper.cpp
+    )
+endif()
+
+
 
 set(QtCore_SRC
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qabstracteventdispatcher_wrapper.cpp
@@ -129,11 +138,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamnamespacedeclaration_wrapper
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamnotationdeclaration_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamreader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamwriter_wrapper.cpp
-
 ${QtCore_46_SRC}
+${QtCore_47_SRC}
 )
 
-execute_generator(core QtCore_SRC "")
+execute_generator(core QtCore_SRC "${CMAKE_CURRENT_BINARY_DIR}")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index e64006c0e..9711e2da6 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -95,6 +95,9 @@
   <enum-type name="QAbstractAnimation::DeletionPolicy"/>
   <enum-type name="QAbstractAnimation::Direction"/>
   <enum-type name="QAbstractAnimation::State"/>
+
+  <enum-type name="QElapsedTimer::ClockType" since="4.7"/>
+
   <!-- From Qt4.6 ^^^ -->
   <primitive-type name="qint8"/>
   <primitive-type name="qint16"/>
@@ -725,6 +728,8 @@
     #include &lt;pyside.h&gt;
   </inject-code>
 
+  <value-type name="QElapsedTimer" since="4.7"/>
+
   <object-type name="QAbstractTableModel" polymorphic-id-expression="qobject_cast&lt;QAbstractTableModel*&gt;(%1)">
     <extra-includes>
       <include file-name="QStringList" location="global"/>
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index f883e4e60..e9f44d784 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -470,7 +470,7 @@ CHECK_QT_GUI_MACRO("SessionManager Support" QT_NO_SESSIONMANAGER QT_SESSIONMANAG
 configure_file(typesystem_gui.xml.in
                "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY)
 
-execute_generator(gui QtGui_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
+execute_generator(gui QtGui_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtCore_BINARY_DIR}")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 956be38e4..f971f2543 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -241,6 +241,7 @@
   <enum-type name="QPageSetupDialog::PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/>
   <enum-type name="QPainter::CompositionMode"/>
   <enum-type name="QPainter::RenderHint" flags="QPainter::RenderHints"/>
+  <enum-type name="QPainter::PixmapFragmentHint" flags="QPainter::PixmapFragmentHints" since="4.7"/>
   <enum-type name="QPainterPath::ElementType"/>
   <enum-type name="QPrintEngine::PrintEnginePropertyKey" />
   <enum-type name="QPrinter::ColorMode"/>
@@ -368,6 +369,7 @@
   <enum-type name="QTextDocument::FindFlag" flags="QTextDocument::FindFlags"/>
   <enum-type name="QTextDocument::MetaInformation"/>
   <enum-type name="QTextDocument::ResourceType"/>
+  <enum-type name="QTextDocument::Stacks" since="4.7"/>
   <enum-type name="QTextEdit::AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/>
   <enum-type name="QTextEdit::LineWrapMode"/>
   <enum-type name="QTextFormat::ObjectTypes"/>
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt
index 9d660e4d4..e66fa3724 100644
--- a/PySide/QtNetwork/CMakeLists.txt
+++ b/PySide/QtNetwork/CMakeLists.txt
@@ -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/
diff --git a/PySide/QtNetwork/typesystem_network-4.7.xml b/PySide/QtNetwork/typesystem_network-4.7.xml
deleted file mode 100644
index b518f0f66..000000000
--- a/PySide/QtNetwork/typesystem_network-4.7.xml
+++ /dev/null
@@ -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>
diff --git a/PySide/QtNetwork/typesystem_network-4.6.xml b/PySide/QtNetwork/typesystem_network.xml
index d9c3e7f34..d3f330eba 100644
--- a/PySide/QtNetwork/typesystem_network-4.6.xml
+++ b/PySide/QtNetwork/typesystem_network.xml
@@ -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>
 
-    <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."/>
-    -->
+    <!-- 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::*"/>
 </typesystem>
diff --git a/PySide/QtNetwork/typesystem_network.xml.in b/PySide/QtNetwork/typesystem_network.xml.in
deleted file mode 100644
index 86262c30e..000000000
--- a/PySide/QtNetwork/typesystem_network.xml.in
+++ /dev/null
@@ -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>