This amends b65159a5ea. Pick-to: 6.2 Change-Id: I6055004375b440997ea41b3e4538854780202e10 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
b65159a5ea