Pick-to: 6.5 6.6 Change-Id: I06c77672c3ca08dfd3e50af25ed3e1669462259a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>