diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp

--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 08:14:44.000000000 -0600

+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-12-01 21:12:25.515488200 -0700

@@ -188,8 +188,13 @@ int runMoc(int _argc, char **_argv)

     pp.macros["Q_MOC_RUN"];

     pp.macros["__cplusplus"];

-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829

+    // Workaround a bugs while parsing some boost headers. See QTBUG-22829 

     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];

+    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];

+    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];

+    pp.macros["BOOST_TYPE_TRAITS_HPP"];

+    pp.macros["BOOST_PREDEF_VERSION_NUMBER_H"];

+    pp.macros["__G_VERSION_MACROS_H__"];

     QByteArray filename;

     QByteArray output;