Pick-to: 6.6 6.5 Fixes: QTBUG-118983 Change-Id: I4473f64a7f9ec838a2bc2f705af77fb4c5df35de Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 9379b634a8a49d809441b0616bac7733dad670ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>