Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mmfphonon

1 files changed, 8 insertions, 12 deletions

diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index ef5b154..c517c22 100644
--- a/src/3rdparty/phonon/mmf/videooutput.cpp
+++ b/src/3rdparty/phonon/mmf/videooutput.cpp
@@ -42,16 +42,10 @@ MMF::VideoOutput::VideoOutput(QWidget* parent)
     TRACE_ENTRY("parent 0x%08x", parent);
 
 #ifndef PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET
-    QPalette palette(Qt::black);
-    //palette.setColor(QPalette::Window, Qt::transparent); 
-    setPalette(palette);  
-    
-    // Widget redraws all of its pixels when it receives a paint event, so Qt
-    // does not need to erase it before generating paint events.
-    setAttribute(Qt::WA_OpaquePaintEvent, true);
-    
-    //setAttribute(Qt::WA_NoSystemBackground, true);
-    //setAutoFillBackground(false);
+    setPalette(QPalette(Qt::black));
+    //setAttribute(Qt::WA_OpaquePaintEvent, true);
+    setAttribute(Qt::WA_NoSystemBackground, true);
+    setAutoFillBackground(false);
 #endif // PHONON_MMF_VIDEOOUTPUT_IS_QWIDGET
 
 #ifdef PHONON_MMF_DEBUG_VIDEO_OUTPUT
@@ -158,7 +152,7 @@ QSize MMF::VideoOutput::sizeHint() const
     if (!m_frameSize.isNull()) {
         result = m_frameSize;
     }
-    
+
     TRACE("  result %d %d", result.width(), result.height());
     return result;
 }
@@ -172,11 +166,13 @@ void MMF::VideoOutput::paintEvent(QPaintEvent* event)
     TRACE("regions %d", event->region().numRects());
     TRACE("type %d", event->type());
 
+/*
     QPainter painter;
     painter.begin(this);
     painter.setBrush(QColor(0, 0, 0, 255));   // opaque black
     painter.drawRects(event->region().rects());
     painter.end();
+*/
 }
 
 void MMF::VideoOutput::resizeEvent(QResizeEvent* event)
@@ -187,7 +183,7 @@ void MMF::VideoOutput::resizeEvent(QResizeEvent* event)
           event->size().width(), event->size().height());
 
     QWidget::resizeEvent(event);
-    
+
     if (m_observer)
         m_observer->videoOutputRegionChanged();
 }