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