From ab54cc46c6eb52163ea1735cc252815172be3a6a Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sun, 31 Mar 2013 20:45:31 +0800 Subject: Doc: Fix minor typos Task-number: QTWEBSITE-514 Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae Reviewed-by: Jerome Pasion --- src/imports/audioengine/qdeclarative_soundinstance_p.cpp | 2 +- src/imports/multimedia/Video.qml | 4 ++-- src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm | 2 +- src/plugins/avfoundation/mediaplayer/avfvideooutput.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp index dc5e9e96e..b1c5f3cca 100644 --- a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp +++ b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp @@ -442,7 +442,7 @@ void QDeclarativeSoundInstance::setVelocity(const QVector3D& velocity) /*! \qmlproperty vector3d QtAudioEngine1::SoundInstance::gain - This property holds the gain adjustment which will be used to modulate the audio ouput level + This property holds the gain adjustment which will be used to modulate the audio output level from this SoundInstance. */ qreal QDeclarativeSoundInstance::gain() const diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index c379c1227..f65054cda 100644 --- a/src/imports/multimedia/Video.qml +++ b/src/imports/multimedia/Video.qml @@ -113,12 +113,12 @@ Item { \li VideoOutput.Stretch - the video is scaled to fit \li VideoOutput.PreserveAspectFit - the video is scaled uniformly to fit without cropping - \li VideoOuput.PreserveAspectCrop - the video is scaled uniformly to fill, cropping + \li VideoOutput.PreserveAspectCrop - the video is scaled uniformly to fill, cropping if necessary \endlist Because this type is for convenience in QML, it does not - support enumerations directly, so enumerations from \c VideoOuput are + support enumerations directly, so enumerations from \c VideoOutput are used to access the available fill modes. The default fill mode is preserveAspectFit. diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm index 54c65fdd4..9a1808491 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm @@ -447,7 +447,7 @@ void AVFMediaPlayerSession::setVideoOutput(AVFVideoOutput *output) if (m_videoOutput == output) return; - //Set the current ouput layer to null to stop rendering + //Set the current output layer to null to stop rendering if (m_videoOutput) { m_videoOutput->setLayer(0); } diff --git a/src/plugins/avfoundation/mediaplayer/avfvideooutput.h b/src/plugins/avfoundation/mediaplayer/avfvideooutput.h index 00302912e..020913929 100644 --- a/src/plugins/avfoundation/mediaplayer/avfvideooutput.h +++ b/src/plugins/avfoundation/mediaplayer/avfvideooutput.h @@ -54,7 +54,7 @@ public: }; #define AVFVideoOutput_iid \ - "org.qt-project.qt.AVFVideoOuput/5.0" + "org.qt-project.qt.AVFVideoOutput/5.0" Q_DECLARE_INTERFACE(AVFVideoOutput, AVFVideoOutput_iid) QT_END_NAMESPACE -- cgit v1.2.3