Oswald Buddenhagen 76c0be34cd Merge branch 'dev' into stable ... This starts Qt 5.1 release cycle Conflicts: src/gui/text/qfontdatabase.cpp src/gui/text/qharfbuzz_copy_p.h src/widgets/kernel/qapplication.cpp src/widgets/kernel/qcoreapplication.cpp Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b		2013-03-20 13:49:28 +01:00
..
dialogs	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
effects	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
graphicsview	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
itemviews	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
kernel	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
styles	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
util	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
widgets	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
widgets.pro	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00