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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
  Prevent warnings about EPOCROOT coming out when not on symbian
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( be1a105be93d7fcbe36d93d0827dc6e98b55de0c )

8 files changed, 191 insertions, 176 deletions

diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c
index c0c6f2c..966b167 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.c
@@ -462,7 +462,7 @@ static HB_Error  Load_CaretValue( HB_CaretValue*  cv,
 static void  Free_CaretValue( HB_CaretValue*  cv)
 {
   if ( cv->CaretValueFormat == 3 )
-    _HB_OPEN_Free_Device( &cv->cvf.cvf3.Device );
+    _HB_OPEN_Free_Device( cv->cvf.cvf3.Device );
 }
 
 
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
index d71a85e..0236271 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c
@@ -433,13 +433,16 @@ static HB_Error  Load_ValueRecord( HB_ValueRecord*  vr,
   return HB_Err_Ok;
 
 Fail1:
-  _HB_OPEN_Free_Device( &vr->DeviceTables[VR_Y_ADVANCE_DEVICE] );
+  if ( vr->DeviceTables )
+    _HB_OPEN_Free_Device( vr->DeviceTables[VR_Y_ADVANCE_DEVICE] );
 
 Fail2:
-  _HB_OPEN_Free_Device( &vr->DeviceTables[VR_X_ADVANCE_DEVICE] );
+  if ( vr->DeviceTables )
+    _HB_OPEN_Free_Device( vr->DeviceTables[VR_X_ADVANCE_DEVICE] );
 
 Fail3:
-  _HB_OPEN_Free_Device( &vr->DeviceTables[VR_Y_PLACEMENT_DEVICE] );
+  if ( vr->DeviceTables )
+    _HB_OPEN_Free_Device( vr->DeviceTables[VR_Y_PLACEMENT_DEVICE] );
 
   FREE( vr->DeviceTables );
   return error;
@@ -450,13 +453,13 @@ static void  Free_ValueRecord( HB_ValueRecord*  vr,
 			       HB_UShort         format )
 {
   if ( format & HB_GPOS_FORMAT_HAVE_Y_ADVANCE_DEVICE )
-    _HB_OPEN_Free_Device( &vr->DeviceTables[VR_Y_ADVANCE_DEVICE] );
+    _HB_OPEN_Free_Device( vr->DeviceTables[VR_Y_ADVANCE_DEVICE] );
   if ( format & HB_GPOS_FORMAT_HAVE_X_ADVANCE_DEVICE )
-    _HB_OPEN_Free_Device( &vr->DeviceTables[VR_X_ADVANCE_DEVICE] );
+    _HB_OPEN_Free_Device( vr->DeviceTables[VR_X_ADVANCE_DEVICE] );
   if ( format & HB_GPOS_FORMAT_HAVE_Y_PLACEMENT_DEVICE )
-    _HB_OPEN_Free_Device( &vr->DeviceTables[VR_Y_PLACEMENT_DEVICE] );
+    _HB_OPEN_Free_Device( vr->DeviceTables[VR_Y_PLACEMENT_DEVICE] );
   if ( format & HB_GPOS_FORMAT_HAVE_X_PLACEMENT_DEVICE )
-    _HB_OPEN_Free_Device( &vr->DeviceTables[VR_X_PLACEMENT_DEVICE] );
+    _HB_OPEN_Free_Device( vr->DeviceTables[VR_X_PLACEMENT_DEVICE] );
   FREE( vr->DeviceTables );
 }
 
@@ -500,34 +503,24 @@ static HB_Error  Get_ValueRecord( GPOS_Instance*    gpi,
   {
     /* pixel -> fractional pixel */
 
-    if ( format & HB_GPOS_FORMAT_HAVE_DEVICE_TABLES )
-    {
-      if ( ALLOC_ARRAY( vr->DeviceTables, 4, HB_Device ) )
-        return error;
-      vr->DeviceTables[VR_X_ADVANCE_DEVICE] = 0;
-      vr->DeviceTables[VR_Y_ADVANCE_DEVICE] = 0;
-      vr->DeviceTables[VR_X_PLACEMENT_DEVICE] = 0;
-      vr->DeviceTables[VR_Y_PLACEMENT_DEVICE] = 0;
-    }
-
     if ( format & HB_GPOS_FORMAT_HAVE_X_PLACEMENT_DEVICE )
     {
-      _HB_OPEN_Get_Device( &vr->DeviceTables[VR_X_PLACEMENT_DEVICE], x_ppem, &pixel_value );
+      _HB_OPEN_Get_Device( vr->DeviceTables[VR_X_PLACEMENT_DEVICE], x_ppem, &pixel_value );
       gd->x_pos += pixel_value << 6;
     }
     if ( format & HB_GPOS_FORMAT_HAVE_Y_PLACEMENT_DEVICE )
     {
-      _HB_OPEN_Get_Device( &vr->DeviceTables[VR_Y_PLACEMENT_DEVICE], y_ppem, &pixel_value );
+      _HB_OPEN_Get_Device( vr->DeviceTables[VR_Y_PLACEMENT_DEVICE], y_ppem, &pixel_value );
       gd->y_pos += pixel_value << 6;
     }
     if ( format & HB_GPOS_FORMAT_HAVE_X_ADVANCE_DEVICE )
     {
-      _HB_OPEN_Get_Device( &vr->DeviceTables[VR_X_ADVANCE_DEVICE], x_ppem, &pixel_value );
+      _HB_OPEN_Get_Device( vr->DeviceTables[VR_X_ADVANCE_DEVICE], x_ppem, &pixel_value );
       gd->x_advance += pixel_value << 6;
     }
     if ( format & HB_GPOS_FORMAT_HAVE_Y_ADVANCE_DEVICE )
     {
-      _HB_OPEN_Get_Device( &vr->DeviceTables[VR_Y_ADVANCE_DEVICE], y_ppem, &pixel_value );
+      _HB_OPEN_Get_Device( vr->DeviceTables[VR_Y_ADVANCE_DEVICE], y_ppem, &pixel_value );
       gd->y_advance += pixel_value << 6;
     }
   }
@@ -698,7 +691,8 @@ static HB_Error  Load_Anchor( HB_Anchor*  an,
   return HB_Err_Ok;
 
 Fail:
-  _HB_OPEN_Free_Device( &an->af.af3.DeviceTables[AF3_X_DEVICE_TABLE] );
+  if ( an->af.af3.DeviceTables )
+    _HB_OPEN_Free_Device( an->af.af3.DeviceTables[AF3_X_DEVICE_TABLE] );
 
   FREE( an->af.af3.DeviceTables );
   return error;
@@ -707,10 +701,10 @@ Fail:
 
 static void  Free_Anchor( HB_Anchor*  an)
 {
-  if ( an->PosFormat == 3 )
+  if ( an->PosFormat == 3 && an->af.af3.DeviceTables )
   {
-    _HB_OPEN_Free_Device( &an->af.af3.DeviceTables[AF3_X_DEVICE_TABLE] );
-    _HB_OPEN_Free_Device( &an->af.af3.DeviceTables[AF3_Y_DEVICE_TABLE] );
+    _HB_OPEN_Free_Device( an->af.af3.DeviceTables[AF3_X_DEVICE_TABLE] );
+    _HB_OPEN_Free_Device( an->af.af3.DeviceTables[AF3_Y_DEVICE_TABLE] );
     FREE( an->af.af3.DeviceTables );
   }
 }
@@ -779,12 +773,9 @@ static HB_Error  Get_Anchor( GPOS_Instance*   gpi,
   case 3:
     if ( !gpi->dvi )
     {
-      if ( ALLOC_ARRAY( an->af.af3.DeviceTables, 2, HB_Device ) )
-        return error;
-
-      _HB_OPEN_Get_Device( &an->af.af3.DeviceTables[AF3_X_DEVICE_TABLE], x_ppem, &pixel_value );
+      _HB_OPEN_Get_Device( an->af.af3.DeviceTables[AF3_X_DEVICE_TABLE], x_ppem, &pixel_value );
       *x_value = pixel_value << 6;
-      _HB_OPEN_Get_Device( &an->af.af3.DeviceTables[AF3_Y_DEVICE_TABLE], y_ppem, &pixel_value );
+      _HB_OPEN_Get_Device( an->af.af3.DeviceTables[AF3_Y_DEVICE_TABLE], y_ppem, &pixel_value );
       *y_value = pixel_value << 6;
     }
     else
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-open-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-open-private.h
index 1f7b353..f1ca278 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-open-private.h
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-open-private.h
@@ -79,7 +79,7 @@ HB_INTERNAL void  _HB_OPEN_Free_LookupList( HB_LookupList*  ll,
 
 HB_INTERNAL void  _HB_OPEN_Free_Coverage( HB_Coverage*  c );
 HB_INTERNAL void  _HB_OPEN_Free_ClassDefinition( HB_ClassDefinition*  cd );
-HB_INTERNAL void  _HB_OPEN_Free_Device( HB_Device**  d );
+HB_INTERNAL void  _HB_OPEN_Free_Device( HB_Device*  d );
 
 
 
@@ -93,7 +93,7 @@ _HB_OPEN_Get_Class( HB_ClassDefinition* cd,
 		    HB_UShort*          klass,
 		     HB_UShort*            index );
 HB_INTERNAL HB_Error
-_HB_OPEN_Get_Device( HB_Device** d,
+_HB_OPEN_Get_Device( HB_Device* d,
 		      HB_UShort    size,
 		      HB_Short*    value );
 
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-open.c b/src/3rdparty/harfbuzz/src/harfbuzz-open.c
index 255b7e6..15cd2c1 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-open.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-open.c
@@ -1353,12 +1353,12 @@ _HB_OPEN_Load_Device( HB_Device** device,
 
 
 HB_INTERNAL void
-_HB_OPEN_Free_Device( HB_Device** d )
+_HB_OPEN_Free_Device( HB_Device* d )
 {
-  if ( *d )
+  if ( d )
   {
-    FREE( (*d)->DeltaValue );
-    FREE( *d );
+    FREE( d->DeltaValue );
+    FREE( d );
   }
 }
 
@@ -1399,21 +1399,11 @@ _HB_OPEN_Free_Device( HB_Device** d )
      mask = 0x00FF                                    */
 
 HB_INTERNAL HB_Error
-_HB_OPEN_Get_Device( HB_Device** device,
+_HB_OPEN_Get_Device( HB_Device* d,
 		      HB_UShort    size,
 		      HB_Short*    value )
 {
-  HB_Device* d;
   HB_UShort  byte, bits, mask, f, s;
-  HB_Error   error;
-
-  if ( ALLOC( *device, sizeof(HB_Device)) )
-  {
-    *device = 0;
-    return error;
-  }
-
-  d = *device;
 
   f = d->DeltaFormat;
 
@@ -1436,8 +1426,6 @@ _HB_OPEN_Get_Device( HB_Device** device,
   else
   {
     *value = 0;
-    FREE( *device );
-    *device = 0;
     return HB_Err_Not_Covered;
   }
 }
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 482982d..1b8e789 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
 
 and has the sha1 checksum
 
-        a13977ce2aba31808a046cddc082a84dc316d78b
+        be1a105be93d7fcbe36d93d0827dc6e98b55de0c
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 63af196..8a75d6b 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-06-16  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] QtWebKit crashes while initializing flash plugin 10.1.53.64.
+        https://bugs.webkit.org/show_bug.cgi?id=40567
+
+        Avoid preventable crashes by ensuring gtk_init() is called in the
+        flash viewer plugins before calling NP_Initialize.
+
+        * plugins/qt/PluginPackageQt.cpp:
+        (WebCore::PluginPackage::load):
+
 2010-06-10  Raine Makelainen  <raine.makelainen@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
index 8119924..4ff520b 100644
--- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
@@ -35,6 +35,8 @@
 
 namespace WebCore {
 
+typedef void gtkInitFunc(int *argc, char ***argv);
+
 bool PluginPackage::fetchInfo()
 {
     if (!load())
@@ -109,6 +111,7 @@ bool PluginPackage::load()
 
     NP_InitializeFuncPtr NP_Initialize;
     NPError npErr;
+    gtkInitFunc* gtkInit;
 
     NP_Initialize = (NP_InitializeFuncPtr)m_module->resolve("NP_Initialize");
     m_NPP_Shutdown = (NPP_ShutdownProcPtr)m_module->resolve("NP_Shutdown");
@@ -127,6 +130,26 @@ bool PluginPackage::load()
         m_browserFuncs.getvalue = staticPluginQuirkRequiresGtkToolKit_NPN_GetValue;
     }
 
+    // WORKAROUND: Prevent gtk based plugin crashes such as BR# 40567 by
+    // explicitly forcing the initializing of Gtk, i.e. calling gtk_init,
+    // whenver the symbol is present in the plugin library loaded above.
+    // Note that this workaround is based on code from the NSPluginClass ctor
+    // in KDE's kdebase/apps/nsplugins/viewer/nsplugin.cpp file.
+    gtkInit = (gtkInitFunc*)m_module->resolve("gtk_init");
+    if (gtkInit) {
+        // Prevent gtk_init() from replacing the X error handlers, since the Gtk
+        // handlers abort when they receive an X error, thus killing the viewer.
+#ifdef Q_WS_X11
+        int (*old_error_handler)(Display*, XErrorEvent*) = XSetErrorHandler(0);
+        int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0);
+#endif
+        gtkInit(0, 0);
+#ifdef Q_WS_X11
+        XSetErrorHandler(old_error_handler);
+        XSetIOErrorHandler(old_io_error_handler);
+#endif
+    }
+
 #if defined(XP_UNIX)
     npErr = NP_Initialize(&m_browserFuncs, &m_pluginFuncs);
 #else
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index da41f18..7a6fdf8 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -1,127 +1,127 @@
 # MMF Phonon backend
-
-QT += phonon
-TARGET = phonon_mmf
-PHONON_MMF_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf
-
-# Uncomment the following line in order to use the CDrmPlayerUtility client
-# API for audio playback, rather than CMdaAudioPlayerUtility.
-#CONFIG += phonon_mmf_audio_drm
-
-phonon_mmf_audio_drm {
-    LIBS += -lDrmAudioPlayUtility
-    DEFINES += QT_PHONON_MMF_AUDIO_DRM
-} else {
-    LIBS += -lmediaclientaudio
-}
-
-# This is necessary because both epoc32/include and Phonon contain videoplayer.h.
-# By making /epoc32/include the first SYSTEMINCLUDE, we ensure that
-# '#include <videoplayer.h>' picks up the Symbian header, as intended.
-PREPEND_INCLUDEPATH = /epoc32/include
-
-PREPEND_INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty
-
-INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
-
-HEADERS +=                                           \
-           $$PHONON_MMF_DIR/abstractaudioeffect.h    \
-           $$PHONON_MMF_DIR/abstractmediaplayer.h    \
-           $$PHONON_MMF_DIR/abstractplayer.h         \
-           $$PHONON_MMF_DIR/abstractvideooutput.h    \
-           $$PHONON_MMF_DIR/abstractvideoplayer.h    \
-           $$PHONON_MMF_DIR/audioequalizer.h         \
-           $$PHONON_MMF_DIR/audiooutput.h            \
-           $$PHONON_MMF_DIR/audioplayer.h            \
-           $$PHONON_MMF_DIR/backend.h                \
-           $$PHONON_MMF_DIR/bassboost.h              \
-           $$PHONON_MMF_DIR/defs.h                   \
-           $$PHONON_MMF_DIR/dummyplayer.h            \
-           $$PHONON_MMF_DIR/effectfactory.h          \
-           $$PHONON_MMF_DIR/effectparameter.h        \
-           $$PHONON_MMF_DIR/environmentalreverb.h    \
-           $$PHONON_MMF_DIR/loudness.h               \
-           $$PHONON_MMF_DIR/mediaobject.h            \
-           $$PHONON_MMF_DIR/mmf_medianode.h          \
-           $$PHONON_MMF_DIR/stereowidening.h         \
-           $$PHONON_MMF_DIR/objectdump.h             \
-           $$PHONON_MMF_DIR/objectdump_symbian.h     \
-           $$PHONON_MMF_DIR/objecttree.h             \
-           $$PHONON_MMF_DIR/utils.h                  \
-           $$PHONON_MMF_DIR/videowidget.h
-
-SOURCES +=                                           \
-           $$PHONON_MMF_DIR/abstractaudioeffect.cpp  \
-           $$PHONON_MMF_DIR/abstractmediaplayer.cpp  \
-           $$PHONON_MMF_DIR/abstractplayer.cpp       \
-           $$PHONON_MMF_DIR/audioequalizer.cpp       \
-           $$PHONON_MMF_DIR/audiooutput.cpp          \
-           $$PHONON_MMF_DIR/audioplayer.cpp          \
-           $$PHONON_MMF_DIR/abstractvideooutput.cpp  \
-           $$PHONON_MMF_DIR/abstractvideoplayer.cpp  \
-           $$PHONON_MMF_DIR/backend.cpp              \
-           $$PHONON_MMF_DIR/bassboost.cpp            \
-           $$PHONON_MMF_DIR/dummyplayer.cpp          \
-           $$PHONON_MMF_DIR/effectfactory.cpp        \
-           $$PHONON_MMF_DIR/effectparameter.cpp      \
-           $$PHONON_MMF_DIR/environmentalreverb.cpp  \
-           $$PHONON_MMF_DIR/loudness.cpp             \
-           $$PHONON_MMF_DIR/mediaobject.cpp          \
-           $$PHONON_MMF_DIR/mmf_medianode.cpp        \
-           $$PHONON_MMF_DIR/stereowidening.cpp       \
-           $$PHONON_MMF_DIR/objectdump.cpp           \
-           $$PHONON_MMF_DIR/objectdump_symbian.cpp   \
-           $$PHONON_MMF_DIR/objecttree.cpp           \
-           $$PHONON_MMF_DIR/utils.cpp                \
-           $$PHONON_MMF_DIR/videowidget.cpp
-
-# Test for whether the build environment supports video rendering to graphics
-# surfaces.
-exists($${EPOCROOT}epoc32/include/platform/videoplayer2.h) {
-    HEADERS +=                                       \
-           $$PHONON_MMF_DIR/videooutput_surface.h    \
-           $$PHONON_MMF_DIR/videoplayer_surface.h
-    SOURCES +=                                       \
-           $$PHONON_MMF_DIR/videooutput_surface.cpp  \
-           $$PHONON_MMF_DIR/videoplayer_surface.cpp
-    DEFINES += PHONON_MMF_VIDEO_SURFACES
-} else {
-    HEADERS +=                                       \
-           $$PHONON_MMF_DIR/ancestormovemonitor.h    \
-           $$PHONON_MMF_DIR/videooutput_dsa.h        \
-           $$PHONON_MMF_DIR/videoplayer_dsa.h
-    SOURCES +=                                       \
-           $$PHONON_MMF_DIR/ancestormovemonitor.cpp  \
-           $$PHONON_MMF_DIR/videooutput_dsa.cpp      \
-           $$PHONON_MMF_DIR/videoplayer_dsa.cpp      \
+symbian {
+	QT += phonon
+	TARGET = phonon_mmf
+	PHONON_MMF_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf
+
+	# Uncomment the following line in order to use the CDrmPlayerUtility client
+	# API for audio playback, rather than CMdaAudioPlayerUtility.
+	#CONFIG += phonon_mmf_audio_drm
+
+	phonon_mmf_audio_drm {
+		LIBS += -lDrmAudioPlayUtility
+		DEFINES += QT_PHONON_MMF_AUDIO_DRM
+	} else {
+		LIBS += -lmediaclientaudio
+	}
+
+	# This is necessary because both epoc32/include and Phonon contain videoplayer.h.
+	# By making /epoc32/include the first SYSTEMINCLUDE, we ensure that
+	# '#include <videoplayer.h>' picks up the Symbian header, as intended.
+	PREPEND_INCLUDEPATH = /epoc32/include
+
+	PREPEND_INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty
+
+	INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+	HEADERS +=                                           \
+			   $$PHONON_MMF_DIR/abstractaudioeffect.h    \
+			   $$PHONON_MMF_DIR/abstractmediaplayer.h    \
+			   $$PHONON_MMF_DIR/abstractplayer.h         \
+			   $$PHONON_MMF_DIR/abstractvideooutput.h    \
+			   $$PHONON_MMF_DIR/abstractvideoplayer.h    \
+			   $$PHONON_MMF_DIR/audioequalizer.h         \
+			   $$PHONON_MMF_DIR/audiooutput.h            \
+			   $$PHONON_MMF_DIR/audioplayer.h            \
+			   $$PHONON_MMF_DIR/backend.h                \
+			   $$PHONON_MMF_DIR/bassboost.h              \
+			   $$PHONON_MMF_DIR/defs.h                   \
+			   $$PHONON_MMF_DIR/dummyplayer.h            \
+			   $$PHONON_MMF_DIR/effectfactory.h          \
+			   $$PHONON_MMF_DIR/effectparameter.h        \
+			   $$PHONON_MMF_DIR/environmentalreverb.h    \
+			   $$PHONON_MMF_DIR/loudness.h               \
+			   $$PHONON_MMF_DIR/mediaobject.h            \
+			   $$PHONON_MMF_DIR/mmf_medianode.h          \
+			   $$PHONON_MMF_DIR/stereowidening.h         \
+			   $$PHONON_MMF_DIR/objectdump.h             \
+			   $$PHONON_MMF_DIR/objectdump_symbian.h     \
+			   $$PHONON_MMF_DIR/objecttree.h             \
+			   $$PHONON_MMF_DIR/utils.h                  \
+			   $$PHONON_MMF_DIR/videowidget.h
+
+	SOURCES +=                                           \
+			   $$PHONON_MMF_DIR/abstractaudioeffect.cpp  \
+			   $$PHONON_MMF_DIR/abstractmediaplayer.cpp  \
+			   $$PHONON_MMF_DIR/abstractplayer.cpp       \
+			   $$PHONON_MMF_DIR/audioequalizer.cpp       \
+			   $$PHONON_MMF_DIR/audiooutput.cpp          \
+			   $$PHONON_MMF_DIR/audioplayer.cpp          \
+			   $$PHONON_MMF_DIR/abstractvideooutput.cpp  \
+			   $$PHONON_MMF_DIR/abstractvideoplayer.cpp  \
+			   $$PHONON_MMF_DIR/backend.cpp              \
+			   $$PHONON_MMF_DIR/bassboost.cpp            \
+			   $$PHONON_MMF_DIR/dummyplayer.cpp          \
+			   $$PHONON_MMF_DIR/effectfactory.cpp        \
+			   $$PHONON_MMF_DIR/effectparameter.cpp      \
+			   $$PHONON_MMF_DIR/environmentalreverb.cpp  \
+			   $$PHONON_MMF_DIR/loudness.cpp             \
+			   $$PHONON_MMF_DIR/mediaobject.cpp          \
+			   $$PHONON_MMF_DIR/mmf_medianode.cpp        \
+			   $$PHONON_MMF_DIR/stereowidening.cpp       \
+			   $$PHONON_MMF_DIR/objectdump.cpp           \
+			   $$PHONON_MMF_DIR/objectdump_symbian.cpp   \
+			   $$PHONON_MMF_DIR/objecttree.cpp           \
+			   $$PHONON_MMF_DIR/utils.cpp                \
+			   $$PHONON_MMF_DIR/videowidget.cpp
+
+	# Test for whether the build environment supports video rendering to graphics
+	# surfaces.
+	symbian:exists($${EPOCROOT}epoc32/include/platform/videoplayer2.h) {
+		HEADERS +=                                       \
+			   $$PHONON_MMF_DIR/videooutput_surface.h    \
+			   $$PHONON_MMF_DIR/videoplayer_surface.h
+		SOURCES +=                                       \
+			   $$PHONON_MMF_DIR/videooutput_surface.cpp  \
+			   $$PHONON_MMF_DIR/videoplayer_surface.cpp
+		DEFINES += PHONON_MMF_VIDEO_SURFACES
+	} else {
+		HEADERS +=                                       \
+			   $$PHONON_MMF_DIR/ancestormovemonitor.h    \
+			   $$PHONON_MMF_DIR/videooutput_dsa.h        \
+			   $$PHONON_MMF_DIR/videoplayer_dsa.h
+		SOURCES +=                                       \
+			   $$PHONON_MMF_DIR/ancestormovemonitor.cpp  \
+			   $$PHONON_MMF_DIR/videooutput_dsa.cpp      \
+			   $$PHONON_MMF_DIR/videoplayer_dsa.cpp      \
+	}
+
+	LIBS += -lcone
+	LIBS += -lws32
+
+	# This is only needed for debug builds, but is always linked against.
+	LIBS += -lhal
+
+	TARGET.CAPABILITY = all -tcb
+
+	LIBS += -lmediaclientvideo        # For CVideoPlayerUtility
+	LIBS += -lcone                    # For CCoeEnv
+	LIBS += -lws32                    # For RWindow
+	LIBS += -lefsrv                   # For file server
+	LIBS += -lapgrfx -lapmime         # For recognizer
+	LIBS += -lmmfcontrollerframework  # For CMMFMetaDataEntry
+	LIBS += -lmediaclientaudiostream  # For CMdaAudioOutputStream
+
+	# These are for effects.
+	LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
+
+	# This is needed for having the .qtplugin file properly created on Symbian.
+	QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
+
+	target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
+	INSTALLS += target
+
+	include(../../qpluginbase.pri)
+
+	TARGET.UID3=0x2001E629
 }
-
-LIBS += -lcone
-LIBS += -lws32
-
-# This is only needed for debug builds, but is always linked against.
-LIBS += -lhal
-
-TARGET.CAPABILITY = all -tcb
-
-LIBS += -lmediaclientvideo        # For CVideoPlayerUtility
-LIBS += -lcone                    # For CCoeEnv
-LIBS += -lws32                    # For RWindow
-LIBS += -lefsrv                   # For file server
-LIBS += -lapgrfx -lapmime         # For recognizer
-LIBS += -lmmfcontrollerframework  # For CMMFMetaDataEntry
-LIBS += -lmediaclientaudiostream  # For CMdaAudioOutputStream
-
-# These are for effects.
-LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
-
-# This is needed for having the .qtplugin file properly created on Symbian.
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
-
-target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
-INSTALLS += target
-
-include(../../qpluginbase.pri)
-
-TARGET.UID3=0x2001E629
-