diff options
| author | Heiko Becker <heirecka@exherbo.org> | 2014-11-07 00:11:02 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2015-06-10 12:58:44 +0100 |
| commit | 1d2edcc9562c8826fd17b5233691f4a313ab71c7 (patch) | |
| tree | 1badfbcc10cf08912b7f682feb7e92d1a56623aa | |
| parent | 77e58dae634fa1b282c64d435d32a2998c671b39 (diff) | |
Workaround build failures with boost>=1.57 and moc
Otherwise I get the following error message:
'usr/include/boost/type_traits/detail/has_binary_operator.hp:50:
Parse error at "BOOST_JOIN"'. See
https://bugreports.qt-project.org/browse/QTBUG-22829 for details.
The old workaround to define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED
doesn't seem to work here.
https://bugzilla.gnome.org/show_bug.cgi?id=739752
| -rw-r--r-- | src/QGlib/connect.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp index 9ff6fde..58a3367 100644 --- a/src/QGlib/connect.cpp +++ b/src/QGlib/connect.cpp @@ -21,8 +21,10 @@ #include <QtCore/QHash> #include <QtCore/QMutex> #include <boost/multi_index_container.hpp> +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include <boost/multi_index/sequenced_index.hpp> #include <boost/multi_index/ordered_index.hpp> +#endif #include <boost/multi_index/member.hpp> namespace QGlib { |