Amends 4f9387f2ae. Pick-to: 6.7 6.5 Change-Id: I3e58967e05afad9f1a0dd581c3795e4f4c8c8de5 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
4f9387f2ae