Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/qt4/patches/qt-4.8.7-moc-boost-workaround.patch

    Contents of /trunk/qt4/patches/qt-4.8.7-moc-boost-workaround.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2609 - (show annotations) (download)
    Fri Jul 10 07:25:22 2015 UTC (8 years, 10 months ago) by niro
    File size: 694 byte(s) 
    -fixed BOOST_JOIN erros with moc
    1 diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp
    2 --- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp 2014-04-10 21:37:12.000000000 +0300
    3 +++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06 02:24:44.287305916 +0200
    4 @@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv)
    5
    6 // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
    7 pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
    8 + pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
    9 + pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
    10
    11 QByteArray filename;
    12 QByteArray output;