Merge remote branch 'qt/4.6' into oslo-staging-2/4.6
authorPaul Olav Tvete <paul.tvete@nokia.com>
Tue, 12 Jan 2010 19:20:01 +0000 (20:20 +0100)
committerPaul Olav Tvete <paul.tvete@nokia.com>
Tue, 12 Jan 2010 19:20:01 +0000 (20:20 +0100)
commit417dd757e8d78d226fc61f6302823bdb6ec09f64
tree7f1d78d88933c5e23294d66e7bb176437464ea3c
parentf71b48c70e215fec77be3b2688ac197cd7f13525
parent796f8235d1d41878030e6992a225fafb1ee64fbe
Merge remote branch 'qt/4.6' into oslo-staging-2/4.6

Conflicts:
dist/changes-4.6.1
20 files changed:
dist/changes-4.6.1
src/corelib/kernel/qmath.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/itemviews/qabstractitemview.cpp
src/gui/itemviews/qtreeview.cpp
src/gui/painting/qoutlinemapper.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengineex.cpp
src/gui/painting/qpainterpath_p.h
src/gui/styles/qcleanlooksstyle.cpp
src/gui/styles/qmacstyle_mac.mm
src/gui/text/qfont.cpp
src/gui/widgets/qspinbox.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
src/opengl/qgl.cpp
src/opengl/qpaintengine_opengl.cpp
tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
tests/auto/qfiledialog2/tst_qfiledialog2.cpp
tests/auto/qtreeview/tst_qtreeview.cpp