From 9f05c7dad5e245b7687905ac21fa29a33c6d291c Mon Sep 17 00:00:00 2001
From: Renato Filho <renato.filho@openbossa.org>
Date: Fri, 5 Aug 2011 14:15:31 -0300
Subject: [PATCH] Initial update typesystem for support Qt 4.8 (beta).

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Luciano Wolf <luciano.wolf@openbossa.org>
---
 PySide/QtCore/typesystem_core.xml      | 12 +++++++++++-
 PySide/QtGui/typesystem_gui_common.xml | 10 +++++++++-
 PySide/QtScript/typesystem_script.xml  |  2 ++
 PySide/QtWebKit/typesystem_webkit.xml  |  3 +++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index d47ad8a..e9ff13d 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -322,6 +322,7 @@
     <enum-type name="WindowModality"/>
     <enum-type name="WindowState" flags="WindowStates"/>
     <enum-type name="WindowType" flags="WindowFlags"/>
+    <enum-type name="CursorMoveStyle" since="4.8" revision="4800"/>
 
    <!--### These functions are part of QtGui, not QtCore -->
     <modify-function signature="codecForHtml(const QByteArray &amp;)" remove="all"/>
@@ -1028,6 +1029,9 @@
     <enum-type name="Language" />
     <enum-type name="MeasurementSystem"/>
     <enum-type name="NumberOption" flags="NumberOptions"/>
+    <enum-type name="Script" since="4.8" revision="4800"/>
+    <enum-type name="CurrencySymbolFormat" since="4.8" revision="4800"/>
+    <enum-type name="QuotationStyle" since="4.8" revision="4800"/>
     <!--### All those C++ number types have the same representation in Python -->
     <modify-function signature="toString(qulonglong) const" remove="all"/>
     <modify-function signature="toString(ushort) const" remove="all"/>
@@ -1252,7 +1256,7 @@
             .. warning:: Because of some Qt/Python itegration rules, the ptr argument do not get the reference incremented during the QModelIndex life time. So it is necessary to keep the object used on ptr argument alive during the whole process. Do not destroy the object if you are not sure about that.
         </inject-documentation>
     </add-function>
-    <modify-function signature="mimeData(QList&lt;QModelIndex&gt;) const">
+    <modify-function signature="mimeData(QModelIndexList) const">
       <modify-argument index="return">
         <define-ownership class="native" owner="c++"/>
         <define-ownership class="target" owner="default"/>
@@ -1978,6 +1982,7 @@
     <enum-type name="FileError"/>
     <enum-type name="MemoryMapFlags"/>
     <enum-type name="Permission" flags="Permissions"/>
+    <enum-type name="FileHandleFlag" flags="FileHandleFlags" since="4.8" revision="4800"/>
     <extra-includes>
       <include file-name="QAbstractFileEngine" location="global"/>
     </extra-includes>
@@ -2457,6 +2462,7 @@
 
   <object-type name="QCoreApplication">
     <enum-type name="Encoding" />
+    <enum-type identified-by-value="ApplicationFlags" since="4.8" revision="4800"/>
     <extra-includes>
       <include file-name="QStringList" location="global"/>
       <include file-name="QTranslator" location="global"/>
@@ -3401,8 +3407,12 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
   <suppress-warning text="signature 'operator*(QByteArray,const char*)' for function modification in 'QByteArray' not found. Possible candidates: *"/>
   <suppress-warning text="signature 'operator+(QByteArray,QString)' for function modification in 'QByteArray' not found. Possible candidates: *"/>
 
+  <!-- This enum is intenaly used -->
+  <suppress-warning text="enum 'PM_CbaIconHeight' does not have a type entry or is not an enum" />
+
   <!-- TODO: this need be removed -->
   <suppress-warning text="skipping function '*', unmatched return type '*'"/>
   <suppress-warning text="skipping function '*', unmatched parameter type '*'"/>
+  
 
 </typesystem>
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 7fbfb7e..d3b0c55 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -641,7 +641,9 @@
         </inject-code>
     </modify-function>
   </value-type>
-  <value-type name="QTextBlockFormat" />
+  <value-type name="QTextBlockFormat">
+    <enum-type name="LineHeightTypes" since="4.8" revision="4800"/>
+  </value-type>
   <value-type name="QTextTableCellFormat" />
   <value-type name="QTextCharFormat" >
     <enum-type name="UnderlineStyle"/>
@@ -958,6 +960,7 @@
     <enum-type name="StyleHint" />
     <enum-type name="StyleStrategy"/>
     <enum-type name="Weight"/>
+    <enum-type name="HintingPreference" since="4.8" revision="4800"/>
     <extra-includes>
       <include file-name="QStringList" location="global"/>
     </extra-includes>
@@ -2184,6 +2187,7 @@
   <object-type name="QItemSelectionModel">
       <enum-type name="SelectionFlag" flags="SelectionFlags"/>
   </object-type>
+  <primitive-type name="QModelIndexList"/>
   <object-type name="QListView">
       <enum-type name="Flow"/>
       <enum-type name="LayoutMode"/>
@@ -7012,7 +7016,11 @@
       </modify-argument>
     </modify-function>
   </object-type>
+
   <!-- The above entries may be present in the system or not. Keep this section organized. -->
 
+  <!-- This enum is present on QtCore -->
+  <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared" />
+
 </typesystem>
 
diff --git a/PySide/QtScript/typesystem_script.xml b/PySide/QtScript/typesystem_script.xml
index f208ac2..4dc3930 100644
--- a/PySide/QtScript/typesystem_script.xml
+++ b/PySide/QtScript/typesystem_script.xml
@@ -40,6 +40,8 @@
     <object-type name="QScriptEngine">
         <enum-type name="QObjectWrapOption" flags="QObjectWrapOptions"/>
         <enum-type name="ValueOwnership"/>
+        <!-- Not supported BUG #957-->
+        <modify-function signature="scriptValueFromQMetaObject()" remove="all" />
     </object-type>
     <object-type name="QScriptExtensionInterface"/>
     <object-type name="QScriptExtensionPlugin"/>
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml
index 5dbd449..ac57dd1 100644
--- a/PySide/QtWebKit/typesystem_webkit.xml
+++ b/PySide/QtWebKit/typesystem_webkit.xml
@@ -81,6 +81,9 @@
     <!-- Qt 4.6 -->
     <enum-type name="ErrorDomain" since="4.6"/>
     <enum-type name="Extension"/>
+    <!-- Qt 4.8 -->
+    <enum-type name="Feature" since="4.8" revision="4800" />
+    <enum-type name="PermissionPolicy" since="4.8" revision="4800" />
 
    <value-type name="ChooseMultipleFilesExtensionOption" />
    <value-type name="ChooseMultipleFilesExtensionReturn" />