Merge pull request #15181 from glassez/qt5