Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Fri, 8 Jan 2010 08:22:10 +0000 (09:22 +0100)
committerSimon Hausmann <simon.hausmann@nokia.com>
Fri, 8 Jan 2010 08:22:10 +0000 (09:22 +0100)
commit6e99e7c7d772e122b0e515c1613d9a1e427181ad
tree08ba4a1db8d17bffa2a69a0538298818668e50fd
parent751de8211033b40c66d88140137eef76e6b20cfa
parent118e7a807d0764dee97612589fe5d7072d271e1e
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
src/multimedia/audio/qaudioformat.cpp
33 files changed:
demos/boxes/scene.cpp
doc/src/snippets/audio/main.cpp
examples/multimedia/audiodevices/audiodevices.cpp
examples/multimedia/audioinput/audioinput.cpp
examples/multimedia/audiooutput/audiooutput.cpp
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/image/qpnghandler.cpp
src/multimedia/audio/qaudio_mac.cpp
src/multimedia/audio/qaudiodeviceinfo.cpp
src/multimedia/audio/qaudiodeviceinfo.h
src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.cpp
src/multimedia/audio/qaudioformat.h
src/multimedia/audio/qaudioinput.cpp
src/multimedia/audio/qaudioinput_alsa_p.cpp
src/multimedia/audio/qaudioinput_mac_p.cpp
src/multimedia/audio/qaudioinput_win32_p.cpp
src/multimedia/audio/qaudiooutput.cpp
src/multimedia/audio/qaudiooutput_alsa_p.cpp
src/multimedia/audio/qaudiooutput_mac_p.cpp
src/multimedia/audio/qaudiooutput_win32_p.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
tests/auto/qaudioformat/tst_qaudioformat.cpp
tests/auto/qaudioinput/tst_qaudioinput.cpp
tests/auto/qaudiooutput/tst_qaudiooutput.cpp
tests/benchmarks/qgraphicsscene/tst_qgraphicsscene.cpp