Frederik Gladhorn 7075e29199 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qstyleanimation.cpp Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8		2013-01-16 01:22:45 +01:00
..
dialogs	Fix warnings about not being able to set Window geometry on Windows.	2013-01-08 13:54:04 +01:00
effects	Make QPen default to 1-width non-cosmetic.	2012-10-22 19:36:43 +02:00
graphicsview	Merge remote-tracking branch 'origin/stable' into dev	2013-01-16 01:22:45 +01:00
itemviews	Merge branch 'stable' into dev	2013-01-09 11:49:47 +01:00
kernel	Enable tst_qwidgetsvariant test	2013-01-11 12:02:21 +01:00
styles	Fix QStyle-test for Windows Aero / 8.	2012-12-18 10:53:57 +01:00
util	Fix warnings about not being able to set Window geometry on Windows.	2013-01-08 13:54:04 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-01-16 01:22:45 +01:00
widgets.pro	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00