1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Description: Wrap boost includes to avoid FTBFS due to qt4 moc.
Author: Robert Bruce Park <robert.park@canonical.com>
Bug-Debian: https://bugs.debian.org/795144
Last-Update: <2015-10-03>
--- a/src/core/macglobalshortcutbackend.mm
+++ b/src/core/macglobalshortcutbackend.mm
@@ -18,7 +18,9 @@
#include "macglobalshortcutbackend.h"
+#ifndef Q_MOC_RUN
#include <boost/noncopyable.hpp>
+#endif
#include <AppKit/NSEvent.h>
#include <AppKit/NSWorkspace.h>
--- a/src/core/scopedtransaction.h
+++ b/src/core/scopedtransaction.h
@@ -20,7 +20,9 @@
#ifndef SCOPEDTRANSACTION_H
#define SCOPEDTRANSACTION_H
+#ifndef Q_MOC_RUN
#include <boost/noncopyable.hpp>
+#endif
class QSqlDatabase;
--- a/src/core/signalchecker.h
+++ b/src/core/signalchecker.h
@@ -21,8 +21,10 @@
#include <glib-object.h>
+#ifndef Q_MOC_RUN
#include <boost/function_types/function_arity.hpp>
#include <boost/typeof/typeof.hpp>
+#endif
// Do not call this directly, use CHECKED_GCONNECT instead.
gulong CheckedGConnect(gpointer source, const char* signal, GCallback callback,
--- a/src/devices/macdevicelister.mm
+++ b/src/devices/macdevicelister.mm
@@ -38,7 +38,9 @@
#import <Foundation/NSString.h>
#import <Foundation/NSURL.h>
+#ifndef Q_MOC_RUN
#include <boost/scope_exit.hpp>
+#endif
#include <libmtp.h>
--- a/src/internet/subsonic/subsonicdynamicplaylist.cpp
+++ b/src/internet/subsonic/subsonicdynamicplaylist.cpp
@@ -21,7 +21,9 @@
#include <QFileInfo>
#include <QSslConfiguration>
#include <QUrlQuery>
+#ifndef Q_MOC_RUN
#include <boost/scope_exit.hpp>
+#endif
#include "core/application.h"
#include "core/logging.h"
|
