diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 22:03:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 22:03:41 (GMT) |
| commit | 1b16a610582990e3274f96bd27a05af45e20f4fe (patch) | |
| tree | 7875d8849309fdde195cf2e34e911548d284b2e1 /src/multimedia | |
| parent | fdcb62d5d6a3e295273042555d2551eb491a5b2d (diff) | |
| parent | af44f857bc9b6698c6a8d2741a0c2b06608ecbad (diff) | |
| download | Qt-1b16a610582990e3274f96bd27a05af45e20f4fe.zip Qt-1b16a610582990e3274f96bd27a05af45e20f4fe.tar.gz Qt-1b16a610582990e3274f96bd27a05af45e20f4fe.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix a crash in QSortFilterProxyModel when deleting a row
small cleanup regarding delayed layout in itemviews
Fixed wasted space in the texture cache.
Get debug code compiling since function signature changes
--warn;
That file was forgotten when adding SSE support under mingw
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h index d555eff..a2cf2ea 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.h +++ b/src/multimedia/audio/qaudioinput_win32_p.h @@ -122,7 +122,7 @@ private: volatile int waveFreeBlockCount; int waveCurrentBlock; - static void CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg, + static void QT_WIN_CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ); WAVEHDR* allocateBlocks(int size, int count); |