Pick-to: 6.11 Change-Id: Ic33c84f8bab20cc2cbae17b7e42bc8ac89153924 Reviewed-by: Simo Fält <simo.falt@qt.io>