From 47b1db7f432c09d5e30198c8d85be5c0598e006c Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 12 Sep 2013 21:27:53 +0400 Subject: [PATCH] Communi backend: fix compilation with boost 1.54/Qt 4.8+ --- backends/libcommuni/ircnetworkplugin.h | 5 ++--- backends/libcommuni/session.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backends/libcommuni/ircnetworkplugin.h b/backends/libcommuni/ircnetworkplugin.h index 527b2ed5..2f19f1dc 100644 --- a/backends/libcommuni/ircnetworkplugin.h +++ b/backends/libcommuni/ircnetworkplugin.h @@ -19,15 +19,14 @@ */ #pragma once - +#ifndef Q_MOC_RUN #include "transport/config.h" #include "transport/networkplugin.h" #include "session.h" #include #include #include "Swiften/EventLoop/Qt/QtEventLoop.h" -#include "ircnetworkplugin.h" - +#endif class IRCNetworkPlugin : public QObject, public NetworkPlugin { Q_OBJECT diff --git a/backends/libcommuni/session.h b/backends/libcommuni/session.h index e4122d43..929a84a7 100644 --- a/backends/libcommuni/session.h +++ b/backends/libcommuni/session.h @@ -21,11 +21,13 @@ #ifndef SESSION_H #define SESSION_H +#ifndef Q_MOC_RUN #include #include #include "Swiften/Swiften.h" #include #include +#endif using namespace Transport;