bring qt mavericks patches into parity with upstream code review