Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: examples/qtestlib/tutorial5/containers.cpp examples/widgets/tools/tools.pro src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/network/kernel/qdnslookup_unix.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp tools/configure/configureapp.cpp Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8		2016-05-06 15:36:44 +02:00
..
doc	Unify license header usage.	2016-03-29 10:20:03 +00:00
generators	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
library	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
cachekeys.h	Updated license headers	2016-01-21 18:55:18 +00:00
main.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
Makefile.unix	Move the official Qt version from qglobal.h to .qmake.conf	2015-10-14 20:12:57 +00:00
Makefile.win32	Add initial clang-cl support to Qt	2016-02-11 12:54: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	qmake: eradicate Q_FOREACH loops [already const]	2016-01-28 20:25:21 +00:00
project.h	Updated license headers	2016-01-21 18:55:18 +00: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	nuke gbuild generator	2015-02-02 11:14:34 +00:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00