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
..
doc	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
generators	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
library	add support for returning the command's exit status to $$system()	2016-08-10 15:42:29 +00:00
cachekeys.h	Updated license headers	2016-01-21 18:55:18 +00:00
main.cpp	moc: get the system #defines from the compiler itself	2016-07-20 02:54:03 +00:00
Makefile.unix	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
Makefile.win32	configure.exe: Remove old code that supported MSVC < 2013	2016-06-20 16:13:06 +00:00
meta.cpp	qmake: eradicate Q_FOREACH loops [needing qAsConst()]	2016-01-28 20:25:18 +00:00
meta.h	Updated license headers	2016-01-21 18:55:18 +00:00
option.cpp	qmake: use reserve to optimize memory allocation.	2016-02-01 20:57:59 +00:00
option.h	qmake: eradicate Q_FOREACH loops [already const]	2016-01-28 20:25:21 +00:00
project.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
project.h	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
property.cpp	qmake: eradicate Q_FOREACH loops [needing qAsConst()]	2016-01-28 20:25:18 +00:00
property.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmake_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmake-aux.pro	configure: Separate host and build platform.	2015-10-30 13:14:51 +00:00
qmake.pri	qmake: Remove Windows CE support.	2016-03-10 13:33:44 +00:00
qmake.pro	qmake/tools: port the last remaining Q_FOREACH loops and add QT_NO_FOREACH	2016-05-11 16:55:32 +00:00