Pick-to: 6.7 Task-number: QTBUG-120912 Change-Id: I12e71c5c3058756e3e0eac420fb19a1f752b64b7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>