diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 16:35:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 16:35:57 (GMT) |
| commit | 50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch) | |
| tree | 7517568b333bcc5679e7a165c48aaa7bd06a66fb /src/multimedia | |
| parent | 61f013168e5ef5111948a1ae0a1464753986adb2 (diff) | |
| parent | ce40a078caa4a09793128ca730cc5ca268aeee87 (diff) | |
| download | Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.zip Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudioengine.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudioinput.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudioengine.cpp b/src/multimedia/audio/qaudioengine.cpp index 7f1f5d3..c379aff 100644 --- a/src/multimedia/audio/qaudioengine.cpp +++ b/src/multimedia/audio/qaudioengine.cpp @@ -133,7 +133,7 @@ QT_BEGIN_NAMESPACE Uses the \a device as the QIODevice to transfer data. If \a device is null then the class creates an internal QIODevice. Returns a pointer to the QIODevice being used to handle the data transfer. This QIODevice can be used to write() audio data directly. Passing a - QIODevice allows the data to be transfered without any extra code. + QIODevice allows the data to be transferred without any extra code. */ /*! @@ -247,7 +247,7 @@ QT_BEGIN_NAMESPACE Uses the \a device as the QIODevice to transfer data. If \a device is null then the class creates an internal QIODevice. Returns a pointer to the QIODevice being used to handle the data transfer. This QIODevice can be used to - read() audio data directly. Passing a QIODevice allows the data to be transfered + read() audio data directly. Passing a QIODevice allows the data to be transferred without any extra code. */ diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index 3676f64..6660c3f 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.cpp @@ -201,7 +201,7 @@ QAudioInput::~QAudioInput() /*! Uses the \a device as the QIODevice to transfer data. - Passing a QIODevice allows the data to be transfered without any extra code. + Passing a QIODevice allows the data to be transferred without any extra code. All that is required is to open the QIODevice. If able to successfully get audio data from the systems audio device the diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp index cf3b79c..b71d48c 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/audio/qaudiooutput.cpp @@ -199,7 +199,7 @@ QAudioFormat QAudioOutput::format() const /*! Uses the \a device as the QIODevice to transfer data. - Passing a QIODevice allows the data to be transfered without any extra code. + Passing a QIODevice allows the data to be transferred without any extra code. All that is required is to open the QIODevice. If able to successfully output audio data to the systems audio device the |