diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:55:03 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 09:55:42 +0100 |
| commit | fa8ee64dd6c20ba6f18a70084ddac16655895df4 (patch) | |
| tree | abfe07c1537f0e4ff15fde30ca4135377948c21c /src/multimedia/audio/qaudiooutput_win32_p.cpp | |
| parent | 697abcc532805fa1d10d56256a5f387fbad8c11b (diff) | |
| parent | 954bb7b9603e6049ef3b22ddd5fad2b324d937c3 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I0f78796735fc37e092b6747bdc89cc0f41164472
Diffstat (limited to 'src/multimedia/audio/qaudiooutput_win32_p.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp index d9d0bf6b3..4d13d4349 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp @@ -131,7 +131,7 @@ QAudioOutputPrivate::~QAudioOutputPrivate() } void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg, - DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 ) + DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 ) { Q_UNUSED(dwParam1) Q_UNUSED(dwParam2) |