Qt Forward Merge Bot 082faeff9c Merge remote-tracking branch 'origin/5.14' into 5.15 ... Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301		2020-01-28 08:09:51 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-01-28 08:09:51 +01:00
qplatformdefs.h	WebAssembly for QtBase	2018-08-30 06:48:33 +00:00