blob: fa82334d7d4b5ed0e5b964ea2f7d46b3cb47e061 (
plain)
1 diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
2 --- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600
3 +++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600
4 @@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
5 Moc moc;
6 pp.macros["Q_MOC_RUN"];
7 pp.macros["__cplusplus"];
8 +
9 + // Workaround a bugs while parsing some boost headers. See QTBUG-22829
10 + pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
11 + pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
12 +
13 QByteArray filename;
14 QByteArray output;
15 FILE *in = 0;
|