summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-06 15:00:08 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-06 15:00:08 (GMT)
commitd17a315a082a8cb5d7f3f5ae47dabbe721982e2c (patch)
tree42165b4a3639be226100b7f40f7544c13db46fa8 /doc/src/snippets
parent54645071fad98b46a44d88b50095dc21ff63fff6 (diff)
parentfa35247d31bd35d72c307f4a6a231400aade0c0b (diff)
downloadQt-d17a315a082a8cb5d7f3f5ae47dabbe721982e2c.zip
Qt-d17a315a082a8cb5d7f3f5ae47dabbe721982e2c.tar.gz
Qt-d17a315a082a8cb5d7f3f5ae47dabbe721982e2c.tar.bz2
Merge commit 'qt/4.6' into mmfphonon
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");