Liang Qi 158a3a4159 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/corelib/io/qiodevice_p.h src/corelib/kernel/qvariant_p.h src/corelib/tools/qsimd.cpp src/gui/kernel/qguiapplication.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a		2016-01-21 08:17:21 +01:00
..
doc	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
generators	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-21 08:17:21 +01:00
library	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-08 12:35:24 +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	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-23 14:45:03 +02: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
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	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-08 12:35:24 +01:00
option.h	add enablers for printing project errors in cumulative mode	2015-12-21 16:39:31 +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-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	…
qmake_pch.h	Update copyright headers	2015-02-11 06:49:51 +00:00