diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-04-01 14:36:19 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-04-01 16:09:34 (GMT) |
| commit | 2f53d62b7c2583e05f2a61c37b237b604d9e9d3b (patch) | |
| tree | 490e925c2e81e21fb71fdd4c92984a4f5355d307 /doc | |
| parent | ef46fa38e50b807c6122dc37d84d2944069ef3ea (diff) | |
| download | Qt-2f53d62b7c2583e05f2a61c37b237b604d9e9d3b.zip Qt-2f53d62b7c2583e05f2a61c37b237b604d9e9d3b.tar.gz Qt-2f53d62b7c2583e05f2a61c37b237b604d9e9d3b.tar.bz2 | |
Doc: Minor language fixes and tidying.
Reviewed-by: TrustMe
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/phonon-api.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/phonon.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qnamespace.qdoc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc index 147ded3..3d04c68 100644 --- a/doc/src/phonon-api.qdoc +++ b/doc/src/phonon-api.qdoc @@ -2568,7 +2568,7 @@ details. Phonon also provides EffectWidget, which lets the user modify the - parameters of an effect an the fly, e.g., with comboboxes. + parameters of an effect an the fly; e.g., with combo boxes. \sa {Phonon Module}, EffectWidget */ diff --git a/doc/src/phonon.qdoc b/doc/src/phonon.qdoc index fa84b96..9470e61 100644 --- a/doc/src/phonon.qdoc +++ b/doc/src/phonon.qdoc @@ -49,7 +49,7 @@ \section1 Introduction Qt uses the Phonon multimedia framework to provide functionality - for playback of the most common multimedia formats.The media can + for playback of the most common multimedia formats. The media can be read from files or streamed over a network, using a QURL to a file. diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index 6220795..e6a1a36 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -508,11 +508,11 @@ \value DirectConnection When emitted, the signal is immediately delivered to the slot. \value QueuedConnection When emitted, the signal is queued until the event loop is able to deliver it to the slot. - \value - BlockingQueuedConnection Same as QueuedConnection, except that the current thread blocks + \value BlockingQueuedConnection + Same as QueuedConnection, except that the current thread blocks until the slot has been delivered. This connection type should only be used for receivers in a different thread. Note that misuse - of this type can lead to dead locks in your application. + of this type can lead to deadlocks in your application. \value AutoConnection If the signal is emitted from the thread in which the receiving object lives, the slot is invoked directly, as with |