diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-06 22:38:59 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-06 22:38:59 (GMT) |
| commit | 101184ea92171c303d240917f34815730a5e9fab (patch) | |
| tree | e265a681a4146f00878cb3a9b6297f6b8b6e0a95 /doc/src/snippets | |
| parent | 396a06a52a0f00639c9e528caf80ae2294e80bd2 (diff) | |
| parent | 2d2b4e8a77a30449d8b4ebc88979b3aff45a8222 (diff) | |
| download | Qt-101184ea92171c303d240917f34815730a5e9fab.zip Qt-101184ea92171c303d240917f34815730a5e9fab.tar.gz Qt-101184ea92171c303d240917f34815730a5e9fab.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/statemachine/main2.cpp | 4 |
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"); |