Frederik Gladhorn ad16478a76 Merge remote-tracking branch 'origin/5.6' into dev ... Based on merge done by Liang Qi Change-Id: Id566e5b9f284d29bff2199f13f9417c660f5b26f		2016-01-08 12:35:24 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-08 12:35:24 +01:00
qplatformdefs.h	Don't include <windows.h> in the MinGW qplatformdefs.h	2015-09-30 11:42:16 +00:00