Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288		2016-08-16 07:58:32 +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: 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