Liang Qi 905329200f Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/gui/image/qpixmap.cpp src/widgets/kernel/qformlayout.cpp Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692		2016-10-11 07:40:32 +02:00
..
ipc	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-11 07:40:32 +02:00
json	Unify license header usage.	2016-03-29 10:20:03 +00:00
mimetypes	mimetypebrowser example: Add Generic Icon Name	2016-08-01 09:41:10 +00:00
threads	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
tools	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00
corelib.pro	Add mime type browser example.	2016-03-24 13:03:02 +00:00