diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-09 07:43:42 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-09 07:43:42 (GMT) |
| commit | d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16 (patch) | |
| tree | c0848d1fc8fd2215fe32d75dcbe86354b0344282 /doc/src/snippets/statemachine/main2.cpp | |
| parent | dbbe24f0f04e5a0aaf9223b73bee873e208a1fa7 (diff) | |
| parent | b8b7f98b01d9ad03fecac7a0f593ac5734d7af1d (diff) | |
| download | Qt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.zip Qt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.tar.gz Qt-d2bcb0dfbc79c382dad87d3d2154ca127ae8fc16.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/animation/qabstractanimation.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/s60installs/s60installs.pro
tools/configure/configureapp.cpp
tools/qdoc3/node.h
Diffstat (limited to 'doc/src/snippets/statemachine/main2.cpp')
| -rw-r--r-- | doc/src/snippets/statemachine/main2.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/src/snippets/statemachine/main2.cpp b/doc/src/snippets/statemachine/main2.cpp index 2419dc2..9a2890f 100644 --- a/doc/src/snippets/statemachine/main2.cpp +++ b/doc/src/snippets/statemachine/main2.cpp @@ -69,17 +69,18 @@ int main(int argv, char **args) //![1] QButton *interruptButton = new QPushButton("Interrupt Button"); + QWidget *mainWindow = new QWidget(); //![3] QHistoryState *s1h = new QHistoryState(s1); QState *s3 = new QState(); s3->assignProperty(label, "text", "In s3"); - QMessageBox mbox; - mbox.addButton(QMessageBox::Ok); - mbox.setText("Interrupted!"); - mbox.setIcon(QMessageBox::Information); - QObject::connect(s3, SIGNAL(entered()), &mbox, SLOT(exec())); + QMessageBox *mbox = new QMessageBox(mainWindow); + mbox->addButton(QMessageBox::Ok); + mbox->setText("Interrupted!"); + mbox->setIcon(QMessageBox::Information); + QObject::connect(s3, SIGNAL(entered()), mbox, SLOT(exec())); s3->addTransition(s1h); machine.addState(s3); |