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