Liang Qi 9808b53fde Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: configure src/plugins/platforms/eglfs/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b		2016-11-15 09:58:16 +01: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-10-27 10:23:39 +02:00
itemmodels	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
json	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-28 11:51:35 +02:00
mimetypes	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +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-09-16 23:16:25 +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