Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorOlivier Goffart <olivier.goffart@nokia.com>
Mon, 25 Oct 2010 08:11:10 +0000 (10:11 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Mon, 25 Oct 2010 08:11:25 +0000 (10:11 +0200)
commit1d509901d185745df74f2aae04783e9be9bb7cd0
tree16df2ab7f33734eb91328d3e6760edd54ce92961
parent890c1110ec5e39bb6e63e99fe09c296c1ea824be
parente5ef6f580e1b601898a2fea095ed5be9823bab25
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
src/corelib/tools/qcryptographichash.cpp
src/opengl/qgl_p.h
examples/multimedia/audiodevices/audiodevices.h
examples/multimedia/audioinput/audioinput.h
examples/multimedia/audiooutput/audiooutput.h