user avatar
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Qt Forward Merge Bot authored
Change-Id: I799f60bf599c0953dbd709285c24dfbc4a97eb62
caa191bb