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/plugins/mediaservices/qt7/qt7movieviewoutput.h | |
| 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/plugins/mediaservices/qt7/qt7movieviewoutput.h')
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7movieviewoutput.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h index 3ac409e..49049ad 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.h +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.h @@ -80,8 +80,8 @@ public: QSize nativeSize() const; - QVideoWidget::AspectRatioMode aspectRatioMode() const; - void setAspectRatioMode(QVideoWidget::AspectRatioMode mode); + Qt::AspectRatioMode aspectRatioMode() const; + void setAspectRatioMode(Qt::AspectRatioMode mode); int brightness() const; void setBrightness(int brightness); @@ -106,7 +106,7 @@ private: QRect m_displayRect; bool m_fullscreen; QSize m_nativeSize; - QVideoWidget::AspectRatioMode m_aspectRatioMode; + Qt::AspectRatioMode m_aspectRatioMode; int m_brightness; int m_contrast; int m_hue; |