Liang Qi 6357813207 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: configure src/3rdparty/double-conversion/include/double-conversion/utils.h src/corelib/global/qnamespace.qdoc src/corelib/tools/qsimd_p.h tests/auto/corelib/io/qfile/tst_qfile.cpp Change-Id: I3ca1007bab5355d251c13002a18e93d81c254d34		2016-05-03 15:49:15 +02:00
..
configure	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-03 15:49:15 +02:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00