Task-number: QTBUG-116071 Pick-to: 6.5 6.6 Change-Id: I7413a0d8085eec38e6480f6aa21c85620ca68f54 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>