From 05225be1d5e210963519540f4a6d49a48b8bf061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 2 Jan 2014 16:53:09 +0100 Subject: [PATCH] fixed lib --- libhive/devicemanager.cpp | 4 ++-- server/server.pro | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libhive/devicemanager.cpp b/libhive/devicemanager.cpp index cb177e1b..af46a132 100644 --- a/libhive/devicemanager.cpp +++ b/libhive/devicemanager.cpp @@ -12,8 +12,8 @@ #include #include -Q_IMPORT_PLUGIN(RfRemoteMumbi) -Q_IMPORT_PLUGIN(RfRemoteIntertechno) +Q_IMPORT_PLUGIN(DevicePluginElro) +Q_IMPORT_PLUGIN(DevicePluginIntertechno) DeviceManager::DeviceManager(QObject *parent) : diff --git a/server/server.pro b/server/server.pro index 938da9b8..2e105f6f 100644 --- a/server/server.pro +++ b/server/server.pro @@ -14,15 +14,15 @@ SOURCES += main.cpp \ hivecore.cpp \ jsonrpcserver.cpp \ tcpserver.cpp \ - ruleengine.cpp \ - rule.cpp + ruleengine.cpp \ + rule.cpp HEADERS += hivecore.h \ jsonrpcserver.h \ tcpserver.h \ - ruleengine.h \ - rule.h + ruleengine.h \ + rule.h # FIXME: Drop this and link them dynamically -LIBS += -L../plugins/deviceplugins/rfremotemumbi/ -lhive_rfremotemumbi -LIBS += -L../plugins/deviceplugins/rfremoteintertechno/ -lhive_rfremoteintertechno +LIBS += -L../plugins/deviceplugins/devicepluginelro/ -lhive_devicepluginelro +LIBS += -L../plugins/deviceplugins/devicepluginintertechno/ -lhive_devicepluginintertechno