Merge remote-tracking branch 'origin/stable' into dev

Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192
This commit is contained in:
Frederik Gladhorn
2013-04-12 12:55:44 +02:00
11 changed files with 64 additions and 10 deletions

View File

@@ -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.