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