Liang Qi 90210d5d9c Merge remote-tracking branch 'origin/5.14' into 5.15 ... Conflicts: tests/auto/network/kernel/qnetworkinterface/BLACKLIST Change-Id: I1e8866c63b54bcd95fc2a044276ee15b7f60e79a		2019-12-10 13:51:40 +02:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.14' into 5.15	2019-12-10 13:51:40 +02:00
qplatformdefs.h	WebAssembly for QtBase	2018-08-30 06:48:33 +00:00