summaryrefslogtreecommitdiff
path: root/qt4/boost-1.48.patch
diff options
context:
space:
mode:
Diffstat (limited to 'qt4/boost-1.48.patch')
-rw-r--r--qt4/boost-1.48.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/qt4/boost-1.48.patch b/qt4/boost-1.48.patch
new file mode 100644
index 000000000..fa82334d7
--- /dev/null
+++ b/qt4/boost-1.48.patch
@@ -0,0 +1,15 @@
+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
+--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 2012-11-23 04:09:53.000000000 -0600
++++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11 07:07:18.942748176 -0600
+@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
+ Moc moc;
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
++
++ // 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"];
++
+ QByteArray filename;
+ QByteArray output;
+ FILE *in = 0;

Generated by cgit