aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Goncalves <mail@cgoncalves.info>2010-02-07 01:54:14 +0000
committerHugo Lima <hugo.lima@openbossa.org>2010-02-08 14:05:55 -0200
commitc8e3a73ee7ab59bff0c7e7c341463dd507383127 (patch)
treeb8f998ca9a13e9703729cb1dc69f2a2ce564a117
parent186911e530ea3c934a13bb9a7d0fe68c2427f829 (diff)
Fixes for QtCore and QtGui type sytems
- Added missing Qt::InputMethodHints flags - Fixed QFontMetricsF::boundingRect Reviewed by Hugo Parente <hugo.lima@openbossa.org>
-rw-r--r--PySide/QtCore/typesystem_core.xml2
-rw-r--r--PySide/QtGui/typesystem_gui_common.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 02aa6ff5a..8fd23df79 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -307,7 +307,7 @@
<enum-type name="Qt::Initialization"/>
<enum-type name="Qt::AnchorPoint"/>
<enum-type name="Qt::NavigationMode"/>
- <enum-type name="Qt::InputMethodHint"/>
+ <enum-type name="Qt::InputMethodHint" flags="Qt::InputMethodHints"/>
<enum-type name="Qt::TouchPointState"/>
<enum-type name="QEasingCurve::Type"/>
<enum-type name="QAbstractAnimation::DeletionPolicy"/>
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 8235f9ea3..009f9282e 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -1031,7 +1031,7 @@
</value-type>
<value-type name="QFontMetricsF" >
- <modify-function signature="boundingRect(QRect,int,QString,int,int*)const">
+ <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const">
<modify-argument index="5">
<remove-argument />
<remove-default-expression />
@@ -1041,7 +1041,7 @@
</modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="fix_return_args,int*">
- <replace from="RETURNTYPE" to="QRect" />
+ <replace from="RETURNTYPE" to="QRectF" />
</insert-template>
</inject-code>
</modify-function>