From b66a253318de90e69ce864621b7c323d98c18783 Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Fri, 26 Mar 2010 13:43:32 +1000
Subject: Phonon core; compile fixes after merge.

---
 src/3rdparty/phonon/phonon/audiodataoutput.cpp | 2 --
 src/3rdparty/phonon/phonon/audiooutput.cpp     | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/3rdparty/phonon/phonon/audiodataoutput.cpp b/src/3rdparty/phonon/phonon/audiodataoutput.cpp
index 6c737c2..3a7d3a1 100644
--- a/src/3rdparty/phonon/phonon/audiodataoutput.cpp
+++ b/src/3rdparty/phonon/phonon/audiodataoutput.cpp
@@ -62,7 +62,5 @@ void AudioDataOutputPrivate::setupBackendObject()
 
 } // namespace Phonon
 
-#include "audiodataoutput.moc"
-
 #undef PHONON_CLASSNAME
 // vim: sw=4 ts=4 tw=80
diff --git a/src/3rdparty/phonon/phonon/audiooutput.cpp b/src/3rdparty/phonon/phonon/audiooutput.cpp
index 932a875..e94caad 100644
--- a/src/3rdparty/phonon/phonon/audiooutput.cpp
+++ b/src/3rdparty/phonon/phonon/audiooutput.cpp
@@ -31,6 +31,7 @@
 #include "pulsesupport.h"
 
 #include <QtCore/qmath.h>
+#include <QtCore/quuid.h>
 
 #define PHONON_CLASSNAME AudioOutput
 #define IFACES2 AudioOutputInterface42
-- 
cgit v0.12