Revert "Fixup Mac toolbar for Qt5 and Qt4 build"

This reverts commit 20739ebb2913c22f677988516e25fd1c3e3362a5.

Qt5 has a number of issues that cannot easily be resolved.

An alternative strategy of developing a custom cocoa control
for the mac toolbar is probably a better way forward.