Continuation to bug #1548766 to consider another upstream fix from https://codereview.qt-project.org/#/c/138681/
Continuation to bug #1548766 to consider another upstream fix from https:/ /codereview. qt-project. org/#/c/ 138681/