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
..
images	Doc: Move threading overviews from qtbase.git to qtdoc.git	2013-11-08 16:45:26 +01:00
snippets	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
src	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
qtcore.qdocconf	Doc: Remove repository name from examplesinstallpath	2016-05-12 12:15:52 +00:00