Liang Qi af0d0b9c06 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h src/plugins/platforms/ios/qiosintegration.h src/widgets/widgets/qcombobox.cpp tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45		2016-10-27 10:23:39 +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-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	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-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