Update Qt to 4.8.5

* head branch is no-longer master, is 4.8
* Remove Qt patch for QTBUG-23258 applied in 4.8.5
* Remove Qt patch for QTBUG-29373 no longer necessary in 4.8.5