diff -r b72c6db6890b -r 5dc02b23752f src/3rdparty/phonon/waveout/mediaobject.cpp --- a/src/3rdparty/phonon/waveout/mediaobject.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/3rdparty/phonon/waveout/mediaobject.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -50,7 +50,7 @@ { ushort b[256]; waveOutGetErrorText(error, (LPWSTR)b, 256); - return QString::fromUtf16(b); + return QString((const QChar *)b); } class WorkerThread : public QThread @@ -70,7 +70,7 @@ } - void CALLBACK MediaObject::WaveOutCallBack(HWAVEOUT m_hWaveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2) + void QT_WIN_CALLBACK MediaObject::WaveOutCallBack(HWAVEOUT m_hWaveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2) { Q_UNUSED(m_hWaveOut); Q_UNUSED(dwInstance);