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