aboutsummaryrefslogtreecommitdiffstats
path: root/PySide/QtGui
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-08-05 14:15:31 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:56:14 -0300
commit9f05c7dad5e245b7687905ac21fa29a33c6d291c (patch)
treeb17700dd29a510070c5eca3f02a9d6b66925efc3 /PySide/QtGui
parent6c47624e9276061a3b003adea844b5ce12d85486 (diff)
Initial update typesystem for support Qt 4.8 (beta).
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide/QtGui')
-rw-r--r--PySide/QtGui/typesystem_gui_common.xml10
1 files changed, 9 insertions, 1 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 7fbfb7ef1..d3b0c5593 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>