qt5base-lts/tests/benchmarks/corelib
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
..
codecs Updated license headers 2016-01-21 18:55:18 +00:00
io Remove Windows CE from tests (others). 2016-03-31 06:14:04 +00:00
json Updated license headers 2016-01-21 18:55:18 +00:00
kernel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
mimetypes Updated license headers 2016-01-21 18:55:18 +00:00
plugin Updated license headers 2016-01-21 18:55:18 +00:00
thread Updated license headers 2016-01-21 18:55:18 +00:00
tools Merge remote-tracking branch 'origin/5.7' into dev 2016-05-03 15:49:15 +02:00
corelib.pro test: Moving tst_QMimeDatabase::inheritsPerformance() test 2012-10-31 19:56:42 +01:00