Liang Qi a224dfc9d1 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: tests/auto/corelib/io/qprocess/tst_qprocess.cpp Change-Id: Ib6955eb874b516b185b45d6c38cec646fbaa95f4		2016-02-29 12:34:31 +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	Add qOverload to select overloaded functions	2016-02-15 12:33:24 +00:00
io	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-29 12:34:31 +01: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	Fix warnings about constructor initialization order in tst_QObject.	2016-02-26 17:37:32 +00:00
mimetypes	Updated license headers	2016-01-21 18:55:18 +00:00
plugin	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-02 15:57:44 +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	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-29 12:34:31 +01:00
xml	Updated license headers	2016-01-21 18:55:18 +00:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00