This amends d8cd56df6b . Task-number: QTBUG-119321 Task-number: QTBUG-126225 Change-Id: Ie252367bde453f1892f5791aa0b20398106b592e Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 1943183282defdbc846813e4ceb66c1eec28fec5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
d8cd56df6b