|
Lines 10-16
Link Here
|
| 10 |
they end up being skipped by moc when it is preprocessing a file. |
10 |
they end up being skipped by moc when it is preprocessing a file. |
| 11 |
--- src/tools/moc/main.cpp.orig 2015-05-07 14:14:44 UTC |
11 |
--- src/tools/moc/main.cpp.orig 2015-05-07 14:14:44 UTC |
| 12 |
+++ src/tools/moc/main.cpp |
12 |
+++ src/tools/moc/main.cpp |
| 13 |
@@ -190,6 +190,13 @@ int runMoc(int _argc, char **_argv) |
13 |
@@ -190,6 +190,17 @@ int runMoc(int _argc, char **_argv) |
| 14 |
|
14 |
|
| 15 |
// Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 |
15 |
// Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 |
| 16 |
pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; |
16 |
pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; |
|
Lines 21-26
Link Here
|
| 21 |
+ // |
21 |
+ // |
| 22 |
+ // For Boost >= 1.55. |
22 |
+ // For Boost >= 1.55. |
| 23 |
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; |
23 |
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; |
|
|
24 |
+ // For Boost >= 1.60. |
| 25 |
+ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; |
| 26 |
+ pp.macros["BOOST_TYPE_TRAITS_HPP"]; |
| 27 |
+ pp.macros["BOOST_TT_HAS_PRE_INCREMENT_HPP_INCLUDED"]; |
| 24 |
|
28 |
|
| 25 |
QByteArray filename; |
29 |
QByteArray filename; |
| 26 |
QByteArray output; |
30 |
QByteArray output; |