Change-Id: I15b97aa757c3b102c0d0a092f4b86710ea9920a9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit aac63b29)