diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:55:44 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:55:44 +0200 |
| commit | f23a7f9da4958527a7fe762f82fa7fc28e8f0adf (patch) | |
| tree | 96191ab23df7c92cee585f4fa0938b82d74b2fac /src/imports | |
| parent | a13b4dbb32bf3c022cae7f1e9e3c792a8140543b (diff) | |
| parent | bf26ab71e0713bbcaa967402992630411086769c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/audioengine/qdeclarative_soundinstance_p.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/Video.qml | 4 |
2 files changed, 3 insertions, 3 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. |