diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-22 03:28:38 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-22 03:28:38 (GMT) |
| commit | 0dff17f1e08f57040f3a156f9f3675024ec59978 (patch) | |
| tree | 0b3c47a172b90acfd3582b7f6d04bb9b8d9ff780 /src/multimedia/base/qvideowindowcontrol.cpp | |
| parent | 1ef014ebae2c28c38c25facd90ba8be71b195195 (diff) | |
| parent | dbd293e2579e80756ca7e711ea1f82b9e42c5b92 (diff) | |
| download | Qt-0dff17f1e08f57040f3a156f9f3675024ec59978.zip Qt-0dff17f1e08f57040f3a156f9f3675024ec59978.tar.gz Qt-0dff17f1e08f57040f3a156f9f3675024ec59978.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/multimedia/base/qvideowindowcontrol.cpp')
| -rw-r--r-- | src/multimedia/base/qvideowindowcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/base/qvideowindowcontrol.cpp b/src/multimedia/base/qvideowindowcontrol.cpp index da46823..c74a0d5 100644 --- a/src/multimedia/base/qvideowindowcontrol.cpp +++ b/src/multimedia/base/qvideowindowcontrol.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE QVideoWindowControl *windowControl = mediaService->control<QVideoWindowControl *>(); windowControl->setWinId(widget->winId()); windowControl->setDisplayRect(widget->rect()); - windowControl->setAspectRatioMode(QVideoWidget::KeepAspectRatio); + windowControl->setAspectRatioMode(Qt::KeepAspectRatio); \endcode QVideoWindowControl is one of number of possible video output controls, @@ -176,7 +176,7 @@ QVideoWindowControl::~QVideoWindowControl() */ /*! - \fn QVideoWindowControl::setAspectRatioMode(QVideoWidget::AspectRatioMode mode) + \fn QVideoWindowControl::setAspectRatioMode(Qt::AspectRatioMode mode) Sets the aspect ratio \a mode which determines how video is scaled to the fit the display region with respect to its aspect ratio. |