qt/0013-Fix-moc-from-choking-on-boost-headers.patch
2013-01-07 07:01:22 -06:00

34 lines
1.0 KiB
Diff

From a6305580b27f0bf1d268b5a3531c8332a57c3864 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Sun, 25 Nov 2012 16:20:00 +0000
Subject: [PATCH 13/90] Fix moc from choking on boost headers.
Fixes several build failures with boost >= 1.48, for example
the kdepim build: https://bugs.kde.org/show_bug.cgi?id=304111
Task-number: QTBUG-22829
Change-Id: Ic37a5290955fbfd18894a228cc9d57615edddea6
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
src/tools/moc/main.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 33344fc..f558a5e 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -187,6 +187,10 @@ int runMoc(int _argc, char **_argv)
Moc moc;
pp.macros["Q_MOC_RUN"];
pp.macros["__cplusplus"];
+
+ // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+
QByteArray filename;
QByteArray output;
FILE *in = 0;
--
1.8.1