Pick-to: 6.1
Change-Id: I78e8aaeea267b3a607e8089c1ca7181721369f15
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>