Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
  Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
  Cleanup after "QGraphicsWidget is painted twice on the first show"
  Changed qgraphicswidget autotest to use qWaitForWindowShown.
  Improved QTest::qWaitForWindowShown on X11.
  Stabilize tst_QGraphicsWidget::initialShow2 (new test)
  Make sure we define S_IFDIR on Windows
  Fix copy/pasto
  Crash when closing any top-level widget on Symbian.
  Cache the sizes of the images in an animated GIF.
  Fix the QAbstractSlider autotest.
  Use OpenVG scissor on 90/180/270 rotations and simple clips.
  Optimize single-rect IntersectClip in OpenVG using the scissor
  QGraphicsWidget is painted twice on the first show.
  Compiler warning in QAbstractSlider.
  Optimize QPathClipper::pathToRect.
  QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.
  QStyleSheetStyle: Fix combinaison of border-image and border-radius
  Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"
  Proper Fav icon is not shown, for all the links default fav icon shown
  Update changes-4.6.2.
  ...

1 files changed, 3 insertions, 0 deletions

diff --git a/src/3rdparty/phonon/ds9/videowidget.cpp b/src/3rdparty/phonon/ds9/videowidget.cpp
index 091be16..95423c6 100644
--- a/src/3rdparty/phonon/ds9/videowidget.cpp
+++ b/src/3rdparty/phonon/ds9/videowidget.cpp
@@ -218,6 +218,9 @@ namespace Phonon
             if (toNative && m_noNativeRendererSupported)
                 return current; //no switch here
 
+            if (!mediaObject())
+                return current;
+
             //firt we delete the renderer
             //initialization of the widgets
             for(int i = 0; i < FILTER_COUNT; ++i) {