Commit f9e17a81 authored by hausmann@webkit.org's avatar hausmann@webkit.org
Browse files

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
parent c236803a
2010-01-06 Simon Hausmann <simon.hausmann@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@chromium.org>
 
Reviewed by Adam Barth.
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment