Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Revert 4.6 commits that shouldn't be in 4.7.
  Revert "Add a children private property needed for QML to support QGraphicsObject"
  Revert "struct -> class, it's better."
  Revert "Add NOTIFY to size property so QML bindings are working fine."
  Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes"
  Revert "Add a a layout property in QGraphicsWidget."
  Add a workaround for a bug in Mac filesystem watcher.
  Another "off by 1" problem in OpenVG - in paths this time.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecfa4583e573ce4dff1f0df12f6bdba3022376e5 )
  Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
  do not detect the echo-without-newline syntax over and over
  speed up by removing nonsense
  no need for CONFIG += ordered here
  Autotest: don't allow choosing between debug/release mode.
  QS60Style: Custom QPushButton: Heigth is calculated wrongly
  Added additional logging to Phonon MMF backend
  Compile on MingW
  struct -> class, it's better.
  Add a a layout property in QGraphicsWidget.
  Fix QFileSystemModel to not install useless watchers on the filesystem

1 files changed, 7 insertions, 1 deletions

diff --git a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp
index 8cb9db5..c2bcce0 100644
--- a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp
@@ -193,11 +193,14 @@ qint64 MMF::AbstractVideoPlayer::totalTime() const
 
 void MMF::AbstractVideoPlayer::videoWindowChanged()
 {
-    TRACE_CONTEXT(AbstractVideoPlayer::videoOutputRegionChanged, EVideoInternal);
+    TRACE_CONTEXT(AbstractVideoPlayer::videoWindowChanged, EVideoInternal);
     TRACE_ENTRY("state %d", state());
 
     m_window = m_videoOutput ? m_videoOutput->videoWindow() : 0;
 
+    if (m_videoOutput)
+        m_videoOutput->dump();
+
     handleVideoWindowChanged();
 
     TRACE_EXIT_0();
@@ -253,6 +256,9 @@ void MMF::AbstractVideoPlayer::MvpuoPrepareComplete(TInt aError)
     TRAPD(err, getVideoClipParametersL(aError));
 
     if (KErrNone == err) {
+        if (m_videoOutput)
+            m_videoOutput->dump();
+
         maxVolumeChanged(m_player->MaxVolume());
 
         if (m_videoOutput)