Pick-to: 6.5 6.6 Change-Id: I7d9281f173ce9fb24c0f565797b6fbcfba10459f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>