diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-26 03:43:32 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-26 03:43:32 (GMT) |
| commit | b66a253318de90e69ce864621b7c323d98c18783 (patch) | |
| tree | 2bbfc314daede769d17c5a5c5c7fce4e68cb2bb8 | |
| parent | 7e60531cc1b70c660dd5635b5d105894a49954f2 (diff) | |
| download | Qt-b66a253318de90e69ce864621b7c323d98c18783.zip Qt-b66a253318de90e69ce864621b7c323d98c18783.tar.gz Qt-b66a253318de90e69ce864621b7c323d98c18783.tar.bz2 | |
Phonon core; compile fixes after merge.
| -rw-r--r-- | src/3rdparty/phonon/phonon/audiodataoutput.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/audiooutput.cpp | 1 |
2 files changed, 1 insertions, 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 |