Task-number: QTBUG-137228 Change-Id: Idda7bfd97ac74a87987dcd4c31440b0c2f193c14 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 3056da6711933d035be14394d6ea9fe72c1aabe9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit a66e8de68c14edbc60e8e742c3692339a9f23e7e) (cherry picked from commit 9dcc6bf3d16fdd0186c9c9142eabc1bcab58c8e7)