Pick-to: 6.0 Change-Id: I8e0917b15eba79e3a616a096722f68088859f0c7 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>