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
..
moc	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-01 18:20:00 +02:00
qdbuscpp2xml	Unify naming of LIBS/CFLAGS for 3rd party libraries	2016-04-07 16:18:03 +00:00
qdbusxml2cpp	Unify naming of LIBS/CFLAGS for 3rd party libraries	2016-04-07 16:18:03 +00:00
qmake	make extra compiler targets depend on their respective compiler	2016-04-18 09:38:10 +00:00
qmakelib	add support for returning the command's exit status to $$system()	2016-08-10 15:42:29 +00:00
rcc	Updated license headers	2016-01-21 18:55:18 +00:00
uic	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-10 17:43:13 +02:00
tools.pro	add test for the qmake library	2015-02-25 13:54:33 +00:00