Liang Qi d456f87ece Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qfilesystemwatcher_win.cpp src/corelib/plugin/plugin.pri src/plugins/platforms/cocoa/qcocoaaccessibility.mm tests/auto/corelib/tools/qlocale/tst_qlocale.cpp Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1		2016-02-11 08:25:04 +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 setFlag method to QFlags	2016-02-08 10:25:09 +00:00
io	Stabilize tst_QProcess::softExitInSlots()	2016-02-01 16:39:23 +00:00
itemmodels	Updated license headers	2016-01-21 18:55:18 +00:00
json	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	tst_qeventloop: replace select with poll	2016-02-04 22:33:51 +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 dev	2016-02-11 08:25:04 +01:00
xml	Updated license headers	2016-01-21 18:55:18 +00:00
corelib.pro	…