Samuel Rødal 2ab9b747fc Merge remote-tracking branch 'gerrit/release' into stable ... Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0		2013-03-21 08:49:01 +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 remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +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