Liang Qi a224dfc9d1 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: tests/auto/corelib/io/qprocess/tst_qprocess.cpp Change-Id: Ib6955eb874b516b185b45d6c38cec646fbaa95f4		2016-02-29 12:34:31 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-29 12:34:31 +01:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00