Liang Qi a20da2353c Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: mkspecs/win32-clang-msvc/qmake.conf src/gui/image/qpnghandler.cpp Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8		2019-04-10 08:16:20 +02:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.13' into dev	2019-04-10 08:16:20 +02:00
qplatformdefs.h	Merge all "win32-msvc*" mkspecs into one	2016-12-23 13:45:39 +00:00