Changeset 846 for trunk/src/3rdparty/phonon/waveout/mediaobject.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/waveout/mediaobject.cpp (modified) (2 diffs)

trunk/src/3rdparty/phonon/waveout/mediaobject.cpp

@@ -51 +51 @@
             ushort b[256];
             waveOutGetErrorText(error, (LPWSTR)b, 256);
-            return QString::fromUtf16(b);
+            return QString((const QChar *)b);
         }
 
@@ -71 +71 @@
 
 
-        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);