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
..
qmake.conf	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
qplatformdefs.h	Update copyright headers	2015-02-11 06:49:51 +00:00