From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sun, 14 Jun 2015 16:38:43 +0000 (+0000)
Subject: qt-everywhere-opensource-src-4.8.5-QTBUG-22829
X-Git-Tag: archive/raspbian/4%4.8.6+git64-g5dc8b2b+dfsg-3+deb8u2+rpi1~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7f6926bee254238fe11cf61235fb3d2ad476867a;p=qt4-x11.git

qt-everywhere-opensource-src-4.8.5-QTBUG-22829


Gbp-Pq: Name qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
---

diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index a2211af5c..f0c5a53c8 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -188,8 +188,9 @@ int runMoc(int _argc, char **_argv)
     pp.macros["Q_MOC_RUN"];
     pp.macros["__cplusplus"];
 
-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
+    // 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;