Liang Qi f285687584 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf		2016-04-05 14:22:45 +02:00
..
ipc	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
json	Unify license header usage.	2016-03-29 10:20:03 +00:00
mimetypes	mimetypebrowser example: Fix building of the hierarchy.	2016-03-30 09:40:35 +00:00
threads	Unify license header usage.	2016-03-29 10:20:03 +00:00
tools	Unify license header usage.	2016-03-29 10:20:03 +00:00
corelib.pro	Add mime type browser example.	2016-03-24 13:03:02 +00:00