Merge remote-tracking branch 'origin/5.12.4' into 5.12

Change-Id: I7ad83f19cf9f47b40088a56d4182514bf5b83508
This commit is contained in:
Qt Forward Merge Bot 2019-06-17 12:33:00 +02:00
commit 718ca6e527

Diff Content Not Available