Liang Qi 4456984da7 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e		2015-10-14 15:45:35 +02:00
..
.gitignore	Moving relevant tests to corelib/global	2011-08-30 13:17:21 +02:00
qnumeric.pro	Merge remote-tracking branch 'origin/5.6' into dev	2015-09-25 14:02:04 +02:00
tst_qnumeric.cpp	Skip tst_QNumeric::addOverflow() for MSVC2015.	2015-09-30 04:28:39 +00:00