]>
Commit | Line | Data |
---|---|---|
29338955 JR |
1 | diff -ur avogadro-1.0.3/libavogadro/src/pythonengine_p.h avogadro-1.0.3-moc/libavogadro/src/pythonengine_p.h |
2 | --- avogadro-1.0.3/libavogadro/src/pythonengine_p.h 2011-04-25 07:22:18.000000000 +0200 | |
3 | +++ avogadro-1.0.3-moc/libavogadro/src/pythonengine_p.h 2013-07-26 20:59:15.179652964 +0200 | |
4 | @@ -27,7 +27,9 @@ | |
5 | ||
6 | #include <avogadro/global.h> | |
7 | #include <avogadro/engine.h> | |
8 | +#ifndef Q_MOC_RUN | |
9 | #include <boost/python.hpp> | |
10 | +#endif | |
11 | ||
12 | namespace Avogadro { | |
13 | ||
14 | diff -ur avogadro-1.0.3/libavogadro/src/pythonextension_p.h avogadro-1.0.3-moc/libavogadro/src/pythonextension_p.h | |
15 | --- avogadro-1.0.3/libavogadro/src/pythonextension_p.h 2011-04-25 07:22:18.000000000 +0200 | |
16 | +++ avogadro-1.0.3-moc/libavogadro/src/pythonextension_p.h 2013-07-26 20:58:34.125949694 +0200 | |
17 | @@ -29,7 +29,9 @@ | |
18 | #include <avogadro/extension.h> | |
19 | #include <avogadro/primitive.h> | |
20 | #include <avogadro/glwidget.h> | |
21 | +#ifndef Q_MOC_RUN | |
22 | #include <boost/python.hpp> | |
23 | +#endif | |
24 | ||
25 | #include <QWidget> | |
26 | #include <QList> | |
27 | diff -ur avogadro-1.0.3/libavogadro/src/pythoninterpreter.h avogadro-1.0.3-moc/libavogadro/src/pythoninterpreter.h | |
28 | --- avogadro-1.0.3/libavogadro/src/pythoninterpreter.h 2011-04-25 07:22:18.000000000 +0200 | |
29 | +++ avogadro-1.0.3-moc/libavogadro/src/pythoninterpreter.h 2013-07-26 21:01:46.450577203 +0200 | |
30 | @@ -26,7 +26,9 @@ | |
31 | #define PYTHONINTERPRETER_H | |
32 | ||
33 | #include <avogadro/global.h> | |
34 | +#ifndef Q_MOC_RUN | |
35 | #include <boost/python.hpp> | |
36 | +#endif | |
37 | #include <avogadro/primitive.h> | |
38 | #include <QString> | |
39 | ||
40 | diff -ur avogadro-1.0.3/libavogadro/src/pythonscript.h avogadro-1.0.3-moc/libavogadro/src/pythonscript.h | |
41 | --- avogadro-1.0.3/libavogadro/src/pythonscript.h 2011-04-25 07:22:18.000000000 +0200 | |
42 | +++ avogadro-1.0.3-moc/libavogadro/src/pythonscript.h 2013-07-26 21:01:53.590641481 +0200 | |
43 | @@ -27,7 +27,9 @@ | |
44 | #define PYTHONSCRIPT_H | |
45 | ||
46 | #include <avogadro/global.h> | |
47 | +#ifndef Q_MOC_RUN | |
48 | #include <boost/python.hpp> | |
49 | +#endif | |
50 | ||
51 | #include "pythonerror.h" | |
52 | ||
53 | diff -ur avogadro-1.0.3/libavogadro/src/pythontool_p.h avogadro-1.0.3-moc/libavogadro/src/pythontool_p.h | |
54 | --- avogadro-1.0.3/libavogadro/src/pythontool_p.h 2011-04-25 07:22:18.000000000 +0200 | |
55 | +++ avogadro-1.0.3-moc/libavogadro/src/pythontool_p.h 2013-07-26 20:58:56.839487711 +0200 | |
56 | @@ -27,7 +27,9 @@ | |
57 | ||
58 | #include <avogadro/global.h> | |
59 | #include <avogadro/tool.h> | |
60 | +#ifndef Q_MOC_RUN | |
61 | #include <boost/python.hpp> | |
62 | +#endif | |
63 | ||
64 | #include <QObject> | |
65 | #include <QAction> |