Attachment 167007 Details for Bug 199601 – devel/qt4-moc patch with additional Boost include guards

[patch] devel/qt4-moc patch with additional Boost include guards

moc-more-boost-defines.patch (text/plain), 1.03 KB, created by Raphael Kubo da Costa on 2016-02-15 00:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2016-02-15 00:10:08 UTC

Size: 1.03 KB

patch

obsolete

>Index: devel/qt4-moc/files/patch-src__tools__moc__main.cpp
>===================================================================
>--- devel/qt4-moc/files/patch-src__tools__moc__main.cpp	(revision 408911)
>+++ devel/qt4-moc/files/patch-src__tools__moc__main.cpp	(working copy)
>@@ -10,7 +10,7 @@
> they end up being skipped by moc when it is preprocessing a file.
> --- src/tools/moc/main.cpp.orig	2015-05-07 14:14:44 UTC
> +++ src/tools/moc/main.cpp
>-@@ -190,6 +190,13 @@ int runMoc(int _argc, char **_argv)
>+@@ -190,6 +190,17 @@ int runMoc(int _argc, char **_argv)
>  
>      // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
>      pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
>@@ -21,6 +21,10 @@
> +    //
> +    // For Boost >= 1.55.
> +    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
>++    // For Boost >= 1.60.
>++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
>++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
>++    pp.macros["BOOST_TT_HAS_PRE_INCREMENT_HPP_INCLUDED"];
>  
>      QByteArray filename;
>      QByteArray output;

Actions: View | Diff

Attachments on bug 199601: 155833 | 155835 | 162139 | 162140 | 165420 | 165706 | 166861 | 167007 | 167562 | 167564 | 167577 | 168130 | 168185 | 168588 | 175960 | 176923 | 176952 | 176977 | 177019 | 177186 | 177226 | 177255