Pick-to: 6.5 6.6 Task-number: QTBUG-108364 Change-Id: I1250a46d60d5b4e85258b93f8f6f6fc4631b3a70 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>