Liang Qi 3cb7302480 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/itemviews/qabstractitemview.cpp src/widgets/itemviews/qabstractitemview_p.h Change-Id: I54589b1365103cb1749186af92aab03a49c94b64		2016-08-01 10:03:21 +02:00
..
animation	Updated license headers	2016-01-21 18:55:18 +00:00
codecs	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
global	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-04 08:59:18 +02:00
io	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-26 10:43:29 +02:00
itemmodels	Updated license headers	2016-01-21 18:55:18 +00:00
json	QJsonObject: add some overloads taking QLatin1String	2016-05-10 21:18:46 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
mimetypes	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-27 09:18:05 +02:00
plugin	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02:00
statemachine	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
thread	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-24 20:37:33 +01:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-01 10:03:21 +02:00
xml	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-26 10:43:29 +02:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00