Liang Qi 6cb8121a44 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/styles/qgtkstyle_p.cpp tests/auto/corelib/io/qtextstream/test/test.pro tests/auto/corelib/plugin/plugin.pro Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b		2016-03-21 09:02:57 +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	tst_qglobal.cpp: fix compilation with an actual C++14 compiler	2016-03-05 09:57:46 +00:00
io	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +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	Add a function to QMetaObject to check for inheritance	2016-03-15 16:36:22 +00:00
mimetypes	Updated license headers	2016-01-21 18:55:18 +00: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-11 20:08:50 +01:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
xml	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
corelib.pro	…