summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Alcantara <paulo.alcantara@openbossa.org>2011-10-31 13:38:19 -0300
committerPaulo Alcantara <paulo.alcantara@openbossa.org>2011-11-01 15:56:24 -0300
commit2a19232a751b73105388fd52d78363d69bb54d7a (patch)
treeeb221aeed1e34285c2ebb39e789e1183a37476e5
parent5e56336a558a77753b0f679477d8c9518340e7cc (diff)
downloadpyside-2a19232a751b73105388fd52d78363d69bb54d7a.tar.gz
pyside-2a19232a751b73105388fd52d78363d69bb54d7a.tar.xz
pyside-2a19232a751b73105388fd52d78363d69bb54d7a.zip
Fix BUG #1031
Signed-off-by: Paulo Alcantara <paulo.alcantara@openbossa.org> Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org> Marcelo Lira <marcelo.lira@openbossa.org>
-rw-r--r--PySide/QtCore/typesystem_core.xml8
-rw-r--r--tests/QtCore/CMakeLists.txt1
-rw-r--r--tests/QtCore/bug_1031.py5
3 files changed, 13 insertions, 1 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 811f41a..ab495c0 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -3037,7 +3037,13 @@
<enum-type name="State"/>
</object-type>
- <object-type name="QAbstractState" since="4.6" />
+ <object-type name="QAbstractState" since="4.6">
+ <modify-function signature="machine() const">
+ <modify-argument index="this">
+ <parent index="return" action="add"/>
+ </modify-argument>
+ </modify-function>
+ </object-type>
<object-type name="QAbstractTransition" since="4.6">
<modify-function signature="QAbstractTransition(QState*)">
diff --git a/tests/QtCore/CMakeLists.txt b/tests/QtCore/CMakeLists.txt
index cdd260e..ca73706 100644
--- a/tests/QtCore/CMakeLists.txt
+++ b/tests/QtCore/CMakeLists.txt
@@ -24,6 +24,7 @@ PYSIDE_TEST(bug_953.py)
PYSIDE_TEST(bug_987.py)
PYSIDE_TEST(bug_994.py)
PYSIDE_TEST(bug_1019.py)
+PYSIDE_TEST(bug_1031.py)
PYSIDE_TEST(blocking_signals_test.py)
PYSIDE_TEST(classinfo_test.py)
PYSIDE_TEST(child_event_test.py)
diff --git a/tests/QtCore/bug_1031.py b/tests/QtCore/bug_1031.py
new file mode 100644
index 0000000..b974525
--- /dev/null
+++ b/tests/QtCore/bug_1031.py
@@ -0,0 +1,5 @@
+from PySide.QtCore import QStateMachine, QState
+
+mach = QStateMachine()
+state = QState(mach)
+print(state.machine())