Liang Qi f34e73a16a Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/kernel/qobject.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb		2016-04-11 09:12:36 +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	fix namespaced build	2016-04-05 14:08:30 +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