merge https://codereview.qt-project.org/c/qt/qtbase/+/327044 https://codereview.qt-project.org/c/qt/qtbase/+/327320 https://codereview.qt-project.org/c/qt/qtbase/+/328471 https://codereview.qt-project.org/c/qt/qtbase/+/327019 https://codereview.qt-project.org/c/qt/qtbase/+/325762