[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f9e17a81b21f69e53a1f91b450bd7dc65c458975
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 11:14:48 2010 +0000

    Unreviewed trivial Qt build fix.
    
    Prefix the phonon includes with phonon/ to avoid conflicts with the S60
    audio routing API ( http://wiki.forum.nokia.com/index.php/Audio_Routing_API ).
    
    * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1fff59c..255bd58 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-06  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Unreviewed trivial Qt build fix.
+
+        Prefix the phonon includes with phonon/ to avoid conflicts with the S60
+        audio routing API ( http://wiki.forum.nokia.com/index.php/Audio_Routing_API ).
+
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
+
 2010-01-05  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
index a0ea58a..85ced26 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
@@ -38,9 +38,10 @@
 #include <QUrl>
 #include <QEvent>
 
-#include <audiooutput.h>
-#include <mediaobject.h>
-#include <videowidget.h>
+#include <phonon/path.h>
+#include <phonon/audiooutput.h>
+#include <phonon/mediaobject.h>
+#include <phonon/videowidget.h>
 
 using namespace Phonon;
 

-- 
WebKit Debian packaging