12 lines
694 B
Diff
12 lines
694 B
Diff
diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
|
|
--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp 2014-04-10 21:37:12.000000000 +0300
|
|
+++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06 02:24:44.287305916 +0200
|
|
@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
|
|
|
|
// Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
|
|
pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
|
|
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
|
|
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
|
|
|
|
QByteArray filename;
|
|
QByteArray output;
|