Pick-to: 6.2 Task-number: QTBUG-96200 Change-Id: I4813c6c91195fade36ce6df7ebd0f691f5cacda8 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>