Liang Qi c7934f2489 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/network/kernel/qnetworkinterface_winrt.cpp tools/configure/configureapp.cpp Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea		2015-11-18 09:01:51 +01:00
..
doc	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
generators	MakefileGenerator::processSources() doesn't need to be virtual.	2015-11-13 15:10:32 +00:00
library	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
cachekeys.h	Update copyright headers	2015-02-11 06:49:51 +00:00
main.cpp	fix installing unix dll symlinks on windows hosts	2015-06-01 13:26:57 +00:00
Makefile.unix	Move the official Qt version from qglobal.h to .qmake.conf	2015-10-14 20:12:57 +00:00
Makefile.win32	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-23 14:45:03 +02:00
meta.cpp	make .prl processing less convoluted	2015-10-02 14:01:13 +00:00
meta.h	make .prl processing less convoluted	2015-10-02 14:01:13 +00:00
option.cpp	QMake: Add option to set qt.conf file.	2015-10-27 13:14:00 +00:00
option.h	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
project.cpp	make fileFixify() calling convention somewhat sane	2015-04-21 12:06:20 +00:00
project.h	make fileFixify() calling convention somewhat sane	2015-04-21 12:06:20 +00:00
property.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
property.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmake_pch.h	Update copyright headers	2015-02-11 06:49:51 +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