--- a/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.mm	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.mm	Mon May 03 13:18:40 2010 +0300
@@ -73,7 +73,7 @@
         : QGLWidget(format, parent),
           m_texRef(0),
           m_nativeSize(640,480),
-          m_aspectRatioMode(QVideoWidget::KeepAspectRatio)
+          m_aspectRatioMode(Qt::KeepAspectRatio)
     {
         setAutoFillBackground(false);        
     }
@@ -152,7 +152,7 @@
         m_nativeSize = size;        
     }
 
-    void setAspectRatioMode(QVideoWidget::AspectRatioMode mode)
+    void setAspectRatioMode(Qt::AspectRatioMode mode)
     {
         if (m_aspectRatioMode != mode) {
             m_aspectRatioMode = mode;
@@ -165,7 +165,7 @@
     {
         QRect displayRect = rect();
 
-        if (m_aspectRatioMode == QVideoWidget::KeepAspectRatio) {
+        if (m_aspectRatioMode == Qt::KeepAspectRatio) {
             QSize size = m_nativeSize;
             size.scale(displayRect.size(), Qt::KeepAspectRatio);
 
@@ -177,7 +177,7 @@
 
     CVOpenGLTextureRef m_texRef;
     QSize m_nativeSize;
-    QVideoWidget::AspectRatioMode m_aspectRatioMode;
+    Qt::AspectRatioMode m_aspectRatioMode;
 };
 
 QT7MovieVideoWidget::QT7MovieVideoWidget(QObject *parent)
@@ -185,7 +185,7 @@
     m_movie(0),    
     m_videoWidget(0),    
     m_fullscreen(false),
-    m_aspectRatioMode(QVideoWidget::KeepAspectRatio),
+    m_aspectRatioMode(Qt::KeepAspectRatio),
     m_brightness(0),
     m_contrast(0),
     m_hue(0),
@@ -217,7 +217,7 @@
     NSOpenGLPixelFormat *nsglPixelFormat = [NSOpenGLView defaultPixelFormat];
     CGLPixelFormatObj cglPixelFormat = static_cast<CGLPixelFormatObj>([nsglPixelFormat CGLPixelFormatObj]);
 
-    CFTypeRef keys[] = { kQTVisualContextWorkingColorSpaceKey };
+    CFTypeRef keys[] = { kQTVisualContextOutputColorSpaceKey };
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
     CFDictionaryRef textureContextAttributes = CFDictionaryCreate(kCFAllocatorDefault,
                                                                   (const void **)keys,
@@ -312,12 +312,12 @@
     return m_nativeSize;
 }
 
-QVideoWidget::AspectRatioMode QT7MovieVideoWidget::aspectRatioMode() const
+Qt::AspectRatioMode QT7MovieVideoWidget::aspectRatioMode() const
 {
     return m_aspectRatioMode;
 }
 
-void QT7MovieVideoWidget::setAspectRatioMode(QVideoWidget::AspectRatioMode mode)
+void QT7MovieVideoWidget::setAspectRatioMode(Qt::AspectRatioMode mode)
 {
     m_aspectRatioMode = mode;
     m_videoWidget->setAspectRatioMode(mode);