summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/statemachine/main2.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-10-07 01:19:38 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-10-07 01:19:38 (GMT)
commit0d0d1691f8c73f9040a0d7020bda96fc7673536a (patch)
tree4913936c00130167b4ae64e0114e61b977425ab4 /doc/src/snippets/statemachine/main2.cpp
parente1452cfc79a1fed77e646427092e181b7eb2ca2f (diff)
parentafcad4b4393b4f7187737fb8b4e528887b07d943 (diff)
downloadQt-0d0d1691f8c73f9040a0d7020bda96fc7673536a.zip
Qt-0d0d1691f8c73f9040a0d7020bda96fc7673536a.tar.gz
Qt-0d0d1691f8c73f9040a0d7020bda96fc7673536a.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/snippets/statemachine/main2.cpp')
-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");