summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-10-06 23:56:02 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-10-06 23:56:02 (GMT)
commitb8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7 (patch)
treeac169cc9df2ff639e81b15dcaf268ed09d2e16cb /doc/src/snippets
parent5584feca163e91588f08b0aa1f3ae2817cd90823 (diff)
parentd7fe798e022884dcbc58844e686a7d4fd39cf027 (diff)
downloadQt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.zip
Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.gz
Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/statemachine/main2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/statemachine/main2.cpp b/doc/src/snippets/statemachine/main2.cpp
index d882400..2419dc2 100644
--- a/doc/src/snippets/statemachine/main2.cpp
+++ b/doc/src/snippets/statemachine/main2.cpp
@@ -57,7 +57,7 @@ int main(int argv, char **args)
//![0]
//![2]
- s12>addTransition(quitButton, SIGNAL(clicked()), s12);
+ s12->addTransition(quitButton, SIGNAL(clicked()), s12);
//![2]
//![1]
@@ -71,7 +71,7 @@ int main(int argv, char **args)
QButton *interruptButton = new QPushButton("Interrupt Button");
//![3]
- QHistoryState *s1h = s1->addHistoryState();
+ QHistoryState *s1h = new QHistoryState(s1);
QState *s3 = new QState();
s3->assignProperty(label, "text", "In s3");