]>
Commit | Line | Data |
---|---|---|
0ffada70 JR |
1 | --- qt-gstreamer-1.2.0/src/QGlib/connect.cpp~ 2014-07-08 18:38:36.000000000 +0000 |
2 | +++ qt-gstreamer-1.2.0/src/QGlib/connect.cpp 2015-04-05 17:47:44.623508930 +0000 | |
3 | @@ -20,10 +20,12 @@ | |
4 | #include <glib-object.h> | |
5 | #include <QtCore/QHash> | |
6 | #include <QtCore/QMutex> | |
7 | +#ifndef Q_MOC_RUN | |
8 | #include <boost/multi_index_container.hpp> | |
9 | #include <boost/multi_index/sequenced_index.hpp> | |
10 | #include <boost/multi_index/ordered_index.hpp> | |
11 | #include <boost/multi_index/member.hpp> | |
12 | +#endif | |
13 | ||
14 | namespace QGlib { | |
15 | namespace Private { | |
16 | --- qt-gstreamer-1.2.0/src/QGlib/connect.h~ 2014-07-08 18:38:36.000000000 +0000 | |
17 | +++ qt-gstreamer-1.2.0/src/QGlib/connect.h 2015-04-05 17:47:10.706840481 +0000 | |
18 | @@ -25,8 +25,10 @@ | |
19 | #include <QtCore/QSharedPointer> | |
20 | #include <QtCore/QFlags> | |
21 | #include <QtCore/QHash> | |
22 | +#ifndef Q_MOC_RUN | |
23 | #include <boost/type_traits.hpp> | |
24 | #include <boost/utility/enable_if.hpp> | |
25 | +#endif | |
26 | ||
27 | namespace QGlib { | |
28 |