Pick-to: 6.9 6.8 Change-Id: Icb2ae16d8d6b9083c1118ef2489fa2a1d7db9bdf Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>