Merge remote branch 'origin/4.6' into 4.7-from-4.6
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 4 Oct 2010 03:57:07 +0000 (13:57 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 4 Oct 2010 03:57:07 +0000 (13:57 +1000)
commitabcea22c5ba45d00c713d25a77773efbf6d941f7
tree9cd98ebad82fc8ef80ff53c47da10f80ec114ffe
parent33b76a659b2f44fa7038e375bbfb4cfd449ae617
parente2c45cbacaa0f48e1397572d3e5baa847c86e9b1
Merge remote branch 'origin/4.6' into 4.7-from-4.6

Conflicts:
src/multimedia/audio/qaudioinput_win32_p.cpp
src/corelib/plugin/qsystemlibrary.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioinput_win32_p.cpp
src/multimedia/audio/qaudiooutput_win32_p.cpp