patched has_binary_operator.hpp (first manually added #endif at end of line 25 with a space between .hpp and #endif, then patched)
Not sure what you mean, but as I said you need to wrap has_binary_operator.hpp in a #ifndef Q_MOC_RUN. Just insert #ifndef Q_MOC_RUN at line 8 and #endif at the end of the file:
I'm not sure what to do with the patching situations, do I:
a) edit manually
and patch?
b) edit manually
or patch?
They're the same thing right?
This:
(first manually added #endif at end of line 25 with a space between .hpp and #endif, then patched)
was confusion from a post on page 29 I think it was, forget that.