diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:52:17 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:52:17 (GMT) |
| commit | 58563dcb2cab0949d21337b7b7cd34e3bdd29bbc (patch) | |
| tree | 2715d69c247748ba1501e50ec432415d3ffebcae /doc/src/snippets | |
| parent | 564f65bdcf42bcdaceea902b99bcbfafef5b97f3 (diff) | |
| parent | 2dc7fae7ea38a0169c4c5c78d0534d688347aacb (diff) | |
| download | Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.zip Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.tar.gz Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
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"); |