diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-24 16:58:05 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-24 16:58:05 (GMT) |
| commit | 90996b73d4f2983d6f721c205b5a0957d3a55aff (patch) | |
| tree | 1ab4215df101422590c7af368cdd22d4f1dc3786 /doc/src | |
| parent | 9345d47c3945b61a27724508e8b3d0aaf7b57bcf (diff) | |
| parent | aabd12223bda6260756ab19430082477d5669c0a (diff) | |
| download | Qt-90996b73d4f2983d6f721c205b5a0957d3a55aff.zip Qt-90996b73d4f2983d6f721c205b5a0957d3a55aff.tar.gz Qt-90996b73d4f2983d6f721c205b5a0957d3a55aff.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/examples/audioinput.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/audio/main.cpp | 3 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_corelib_global_qglobal.cpp | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/doc/src/examples/audioinput.qdoc b/doc/src/examples/audioinput.qdoc index 0b1b551..ac44d75 100644 --- a/doc/src/examples/audioinput.qdoc +++ b/doc/src/examples/audioinput.qdoc @@ -49,6 +49,6 @@ Qt provides the QAudioInput class to enable audio functionality within a standard application user interface. - This example uses a fast-fourier transform on the input audio from the microphone + This example calculates the maximum linear value of the input audio from the microphone and displays the output. */ diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp index e663115..0910865 100644 --- a/doc/src/snippets/audio/main.cpp +++ b/doc/src/snippets/audio/main.cpp @@ -98,8 +98,7 @@ private: //![2] format.setSampleType(QAudioFormat::SignedInt); - QAudioDeviceId id = QAudioDeviceInfo::defaultOutputDevice(); - QAudioDeviceInfo info(id); + QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice()); if (!info.isFormatSupported(format)) format = info.nearestFormat(format); diff --git a/doc/src/snippets/code/src_corelib_global_qglobal.cpp b/doc/src/snippets/code/src_corelib_global_qglobal.cpp index 3c61281..16b1073 100644 --- a/doc/src/snippets/code/src_corelib_global_qglobal.cpp +++ b/doc/src/snippets/code/src_corelib_global_qglobal.cpp @@ -529,3 +529,6 @@ class MyClass : public QObject qFuzzyCompare(1 + 0.0, 1 + 1.0e-200); // This will return true //! [46] +//! [47] +CApaApplication *myApplicationFactory(); +//! [47] |