Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +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 dev	2015-07-01 11:05:26 +02:00
kernel	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +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	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
widgets.pro	Add autotest for QGestureRecognizer.	2014-10-23 21:11:28 +02:00