diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-08 11:53:28 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-08 11:53:28 +0100 |
| commit | 2e62227f950aac8205f2b67e4d7d046836b2c799 (patch) | |
| tree | 87e91115d86896949f69e8c8d993ba795422ef3b /doc/src/frameworks-technologies | |
| parent | 9b0502aa6abf6bb9c07f205bccdf2d9c65027bde (diff) | |
| parent | 118e7a807d0764dee97612589fe5d7072d271e1e (diff) | |
| download | qt4-tools-2e62227f950aac8205f2b67e4d7d046836b2c799.tar.gz | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
Diffstat (limited to 'doc/src/frameworks-technologies')
| -rw-r--r-- | doc/src/frameworks-technologies/animation.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/frameworks-technologies/animation.qdoc b/doc/src/frameworks-technologies/animation.qdoc index cd6e3046cd..77cc8dc9ac 100644 --- a/doc/src/frameworks-technologies/animation.qdoc +++ b/doc/src/frameworks-technologies/animation.qdoc @@ -352,11 +352,11 @@ QStateMachine *machine = new QStateMachine; - QState *state1 = new QState(machine->rootState()); + QState *state1 = new QState(machine); state1->assignProperty(button, "geometry", QRect(0, 0, 100, 30)); machine->setInitialState(state1); - QState *state2 = new QState(machine->rootState()); + QState *state2 = new QState(machine); state2->assignProperty(button, "geometry", QRect(250, 250, 100, 30)); QSignalTransition *transition1 = state1->addTransition(button, |