gitorious.org Git - qt:qt.git/commit

author	Paul Olav Tvete <paul.tvete@nokia.com>
	Tue, 12 Jan 2010 19:20:01 +0000 (20:20 +0100)
committer	Paul Olav Tvete <paul.tvete@nokia.com>
	Tue, 12 Jan 2010 19:20:01 +0000 (20:20 +0100)
commit	417dd757e8d78d226fc61f6302823bdb6ec09f64
tree	7f1d78d88933c5e23294d66e7bb176437464ea3c	tree \| snapshot
parent	f71b48c70e215fec77be3b2688ac197cd7f13525	commit \| diff
parent	796f8235d1d41878030e6992a225fafb1ee64fbe	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmath.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfiledialog.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qabstractitemview.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qtreeview.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qoutlinemapper.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengineex.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainterpath_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qcleanlooksstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qmacstyle_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qspinbox.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qpaintengine_opengl.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qfiledialog2/tst_qfiledialog2.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qtreeview/tst_qtreeview.cpp	diff1 \|	diff2 \|	blob \| history

6b46b7419a5aee9bd5fce67b7bfa8afe8e

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