Pick-to: 6.4 6.3 6.2 Change-Id: Ic30a6353c356f6613f2ef3720b99ebb3b0a7968e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Pick-to: 6.4 6.3 6.2 Change-Id: Ic30a6353c356f6613f2ef3720b99ebb3b0a7968e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>