[patch] Fix linking Core with DBus disabled

dbus_linking.patch (text/plain), 1.33 KB, created by Georg Rudoy on 2014-06-16 16:53:40 UTC

commit 4017753193a769a8bf7de6a54ec2c66954401e2f
Author: 0xd34df00d <[e-mail]>
Date:   Mon Jun 16 17:15:57 2014 +0400

    [Core] Fixed linking without WITH_DBUS_LOADERS.

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index dc2b8d6..5f593ea 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -7,6 +7,10 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
 
 option (WITH_DBUS_LOADERS "Build D-Bus loaders on UNIX" OFF)
 
+if (WITH_DBUS_LOADERS)
+	add_definitions (-DWITH_DBUS_LOADERS)
+endif ()
+
 if (NOT USE_QT5)
 	if (WITH_DBUS_LOADERS)
 		set (QT_USE_QTDBUS TRUE)
diff --git a/src/core/pluginmanager.cpp b/src/core/pluginmanager.cpp
index e769715..4cb479a 100644
--- a/src/core/pluginmanager.cpp
+++ b/src/core/pluginmanager.cpp
@@ -56,9 +56,11 @@
 #include "shortcutmanager.h"
 #include "application.h"
 #include "loaders/sopluginloader.h"
-#ifdef Q_OS_LINUX
-	#include "loaders/dbuspluginloader.h"
+
+#ifdef WITH_DBUS_LOADERS
+#include "loaders/dbuspluginloader.h"
 #endif
+
 #include "settingstab.h"
 
 namespace LeechCraft
@@ -985,7 +987,7 @@ namespace LeechCraft
 
 	Loaders::IPluginLoader_ptr PluginManager::MakeLoader (const QString& filename)
 	{
-#ifndef Q_OS_LINUX
+#ifndef WITH_DBUS_LOADERS
 		return Loaders::IPluginLoader_ptr (new Loaders::SOPluginLoader (filename));
 #else
 		if (DBusMode_)