Bring Qt 4.8 Mavericks patches into parity with upstream