Reintroduce some class definitions.
Qt5MacExtras is required on a Mac; report the version of Qt5
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.08.24-20.00