Simon Hausmann b2603b7665 Merge remote-tracking branch 'origin/5.5' into HEAD ... Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe		2015-07-17 16:35:42 +02:00
..
dialogs	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
effects	fix usage of wince scope	2015-06-05 10:29:10 +00:00
gestures	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
graphicsview	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
itemviews	Merge remote-tracking branch 'origin/5.5' into HEAD	2015-07-17 16:35:42 +02:00
kernel	Merge remote-tracking branch 'origin/5.5' into HEAD	2015-07-17 16:35:42 +02:00
styles	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
util	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
widgets	QComboBox::setView only delete the old view if it is a child	2015-07-08 17:37:33 +00:00
widgets.pro	Add autotest for QGestureRecognizer.	2014-10-23 21:11:28 +02:00