Liang Qi b894a8def5 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: mkspecs/features/qml_module.prf mkspecs/features/qt_common.prf src/gui/text/qzip.cpp src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/windows/array.h src/testlib/qtestcase.cpp src/widgets/dialogs/qfilesystemmodel.h Change-Id: Ie41c5868415b81f7693c80e045497035504bb210		2016-04-29 17:55:20 +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	Disallow non-character Unicode codepoints in QUrl/QUrlQuery	2016-04-26 23:08:11 +00:00
itemmodels	Updated license headers	2016-01-21 18:55:18 +00:00
json	Update testdata	2016-02-17 04:50:50 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-25 14:03:45 +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-03-21 09:02:57 +01: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-04-29 17:55:20 +02:00
xml	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00