Merge remote branch 'origin/master' into qt-master-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 18 Feb 2010 15:48:32 +0000 (16:48 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 18 Feb 2010 15:48:32 +0000 (16:48 +0100)
commit4baa9dfb5273d7b501dcb3f456983262c53cc8d1
treeaf04bea96067fcb8c282067aea00703a25b52069
parent9eacc56619ce471a9777f88c89f64ca95cd6ae63
parentc18beac8163634b48bbf1e7280923e96f5ef0a51
Merge remote branch 'origin/master' into qt-master-from-4.6

Conflicts:
src/corelib/codecs/qtextcodec.h
tests/auto/gestures/tst_gestures.cpp
src/corelib/codecs/qtextcodec.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qeventdispatcher_mac.mm
src/opengl/qglframebufferobject.cpp
tests/auto/gestures/tst_gestures.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp