diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-06 12:44:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-06 12:44:20 (GMT) |
| commit | d63accf173ed58c7746ecd1e3a40ecac263f186f (patch) | |
| tree | 87573a93956f4844bde449bde3161972db826eb1 /doc/src | |
| parent | b0fd5e82c0d7d62a01cce2c1cdcb925bc5a34182 (diff) | |
| parent | e8b3defc466fff9110ee00b6e730d405cde52abc (diff) | |
| download | Qt-d63accf173ed58c7746ecd1e3a40ecac263f186f.zip Qt-d63accf173ed58c7746ecd1e3a40ecac263f186f.tar.gz Qt-d63accf173ed58c7746ecd1e3a40ecac263f186f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Fix QT_NO_CONTEXTMENU
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe )
Fix license check failure.
QHttpSocketEngine: Remove unneeded code
doc: Clarified that .lnk files are System files on Windows.
doc: Clarified that the scene owns its items and destroys them.
QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUG
QAbstractSocket: Warn when wrong QHostInfo was received
doc: Fixed references to currsor position().
Prevent a crash when creating an inputContext from the QApplication dtor.
doc: Added some missing macro descriptions.
Small optimization in QIODevice::readAll()
doc: Added note explaining grabMouse() for Cocoa and Carbon.
doc: Replaced usses of rootState() with state machine pointer.
doc: Fixed typo.
doc: Clarified which values were added in Qt 4.4.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf )
doc: Clarified next and previous activation order.
Fix typo in QFSFileEnginePrivate::canonicalized
tst_qhostinfo benchmark: Fix license header
...
Diffstat (limited to 'doc/src')
| -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, |