From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Tue, 22 Aug 2023 13:42:24 +0000 (+0100)
Subject: fix moc in 4.x tripping over BOOST
X-Git-Tag: archive/raspbian/4%4.8.7+dfsg-18+rpi1+deb10u2^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0567ee2709381ce23458f77c496bd9f1c4ba4873;p=qt4-x11.git

fix moc in 4.x tripping over BOOST

Origin: http://pkgs.fedoraproject.org/cgit/qt.git/plain/qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch?id=e41de7f53a97dd68f1bd13fe64b6d84cf945397a
Bug: https://bugreports.qt-project.org/browse/QTBUG-22829
Bug-Debian: http://bugs.debian.org/704045
Bug-RedHat: https://bugzilla.redhat.com/756395
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/1119656
Applied-Upstream: Qt5 has proper parsing support.


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 147e3f5a7..cec43e86a 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;