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
..
mac	Xcode generator: only replace the suffix in the library path	2015-11-09 08:35:04 +00:00
unix	support relative paths in QMAKE_RPATHDIR	2015-10-20 17:18:16 +00:00
win32	Support precompiled header files without file extension in VS projects	2016-01-18 16:06:46 +00:00
makefile.cpp	MakefileGenerator: use erase and std::remove_if with QVector	2016-01-12 05:16:48 +00:00
makefile.h	MakefileGenerator::processSources() doesn't need to be virtual.	2015-11-13 15:10:32 +00:00
makefiledeps.cpp	qmake: Combine two variables into an array to simplify a loop.	2015-12-17 13:47:37 +00:00
makefiledeps.h	Update copyright headers	2015-02-11 06:49:51 +00:00
metamakefile.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
metamakefile.h	Update copyright headers	2015-02-11 06:49:51 +00:00
projectgenerator.cpp	QtCore/qmake: drop some unneeded QChar -> QString conversions	2015-10-11 12:29:28 +00:00
projectgenerator.h	Update copyright headers	2015-02-11 06:49:51 +00:00
xmloutput.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
xmloutput.h	Update copyright headers	2015-02-11 06:49:51 +00:00