summaryrefslogtreecommitdiffstats
path: root/src/multimedia/base/qvideowindowcontrol.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-19 02:20:44 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-19 02:20:44 (GMT)
commitd05ecf5998d8ef2b344f3763fbf97f7426336728 (patch)
treea4c8ec6b1fc27b163487de2c35c27955ed7c37d3 /src/multimedia/base/qvideowindowcontrol.h
parentcd47b6aad611dae7d143233013c48d48a5c0c192 (diff)
parentde300d7a41b0e428ba11e6061c39580c54012dc9 (diff)
downloadQt-d05ecf5998d8ef2b344f3763fbf97f7426336728.zip
Qt-d05ecf5998d8ef2b344f3763fbf97f7426336728.tar.gz
Qt-d05ecf5998d8ef2b344f3763fbf97f7426336728.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts: tests/auto/declarative/qdeclarativeecmascript/testtypes.h
Diffstat (limited to 'src/multimedia/base/qvideowindowcontrol.h')
-rw-r--r--src/multimedia/base/qvideowindowcontrol.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/base/qvideowindowcontrol.h b/src/multimedia/base/qvideowindowcontrol.h
index 9ee96ab..53f7b0e 100644
--- a/src/multimedia/base/qvideowindowcontrol.h
+++ b/src/multimedia/base/qvideowindowcontrol.h
@@ -74,8 +74,8 @@ public:
virtual QSize nativeSize() const = 0;
- virtual QVideoWidget::AspectRatioMode aspectRatioMode() const = 0;
- virtual void setAspectRatioMode(QVideoWidget::AspectRatioMode mode) = 0;
+ virtual Qt::AspectRatioMode aspectRatioMode() const = 0;
+ virtual void setAspectRatioMode(Qt::AspectRatioMode mode) = 0;
virtual int brightness() const = 0;
virtual void setBrightness(int brightness) = 0;