Changes to qtbase for HiDPI build errors