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

Change-Id: I5cc539cf5d956ac02c754b56c4f24af163a47f33
This commit is contained in:
Qt Forward Merge Bot 2018-08-28 03:00:50 +02:00
commit f63bc9c023

Diff Content Not Available