Pick-to: 6.7 6.5 Change-Id: I390aee8c17d971781e7e243cd7bf98e10212f648 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>