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

author	Morten Johan Sørvig <morten.sorvig@nokia.com>
	Thu, 5 Nov 2009 07:26:06 +0000 (08:26 +0100)
committer	Morten Johan Sørvig <morten.sorvig@nokia.com>
	Thu, 5 Nov 2009 07:26:06 +0000 (08:26 +0100)
commit	7f7d4cdf01409283d32a6799c1f73663b8ec3ea1
tree	057102ed546240efc7e5e8054e150fecf0e14001	tree \| snapshot
parent	aa58293b57a05cd52b36ba14a05958dceb65c603	commit \| diff
parent	91c09562ed9c6eb1bd3a4dbd84a8cc64647751ee	commit \| diff

Merge branch '4.5' into 4.6

Conflicts:
tests/auto/qsqlquery/tst_qsqlquery.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp

6b46b7419a5aee9bd5fce67b7bfa8afe8e

src/gui/accessible/qaccessible_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfiledialog_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_mac.mm	diff1 \|	diff2 \|	blob \| history
src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/drivers/psql/qsql_psql.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/models/qsqltablemodel.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qsqlquery/tst_qsqlquery.cpp	diff1 \|	diff2 \|	blob \| history