#9245 replace Q_WS_MACX with Q_OS_MAC - the Q_OS_MAC macro is usable with Qt4 and Qt5.
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.08.25-19.00