diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-06 12:45:29 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-06 12:45:29 (GMT) |
| commit | a628b5579a977594cf125110589c8bd5096db380 (patch) | |
| tree | 104988aaef8d19f7a24610eef50ebb9633eaa376 /doc | |
| parent | 982cffb529f65c7d0c401844ef9af1925e550ffb (diff) | |
| parent | e8b3defc466fff9110ee00b6e730d405cde52abc (diff) | |
| download | Qt-a628b5579a977594cf125110589c8bd5096db380.zip Qt-a628b5579a977594cf125110589c8bd5096db380.tar.gz Qt-a628b5579a977594cf125110589c8bd5096db380.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/development/designer-manual.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/frameworks-technologies/animation.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc index bfd8066..d7666f6 100644 --- a/doc/src/development/designer-manual.qdoc +++ b/doc/src/development/designer-manual.qdoc @@ -371,7 +371,7 @@ {setValue()} slot. To do this, you have to switch to \gui{Edit Signals/Slots} mode, either by - pressing \key{F4} or something \gui{Edit Signals/Slots} from the \gui{Edit} + pressing \key{F4} or selecting \gui{Edit Signals/Slots} from the \gui{Edit} menu. \table diff --git a/doc/src/frameworks-technologies/animation.qdoc b/doc/src/frameworks-technologies/animation.qdoc index cd6e304..77cc8dc 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, |