fix warnings

pull/1/head
Michael Zanetti 2014-01-03 18:45:36 +01:00
parent 04df5cc685
commit 75dfbc36d9
7 changed files with 16 additions and 15 deletions

View File

@ -1,6 +1,8 @@
TARGET = hive
TEMPLATE = lib
CONFIG += c++11
target.path = /usr/lib
INSTALLS += target

View File

@ -1,11 +1,7 @@
TEMPLATE = lib
CONFIG += plugin static
include(../../plugins.pri)
TARGET = $$qtLibraryTarget(hive_devicepluginelro)
INCLUDEPATH += ../../../libhive
LIBS += -L../../../libhive -lhive
SOURCES += \
devicepluginelro.cpp

View File

@ -1,11 +1,7 @@
TEMPLATE = lib
CONFIG += plugin static
include (../../plugins.pri)
TARGET = $$qtLibraryTarget(hive_devicepluginintertechno)
INCLUDEPATH += ../../../libhive
LIBS += -L../../../libhive -lhive
SOURCES += \
devicepluginintertechno.cpp

View File

@ -1,11 +1,7 @@
TEMPLATE = lib
CONFIG += plugin static
include(../../plugins.pri)
TARGET = $$qtLibraryTarget(hive_devicepluginmeisteranker)
INCLUDEPATH += ../../../libhive
LIBS += -L../../../libhive -lhive
SOURCES += \
devicepluginmeisteranker.cpp

6
plugins/plugins.pri Normal file
View File

@ -0,0 +1,6 @@
TEMPLATE = lib
CONFIG += plugin static c++11
INCLUDEPATH += ../../../libhive
LIBS += -L../../../libhive -lhive

View File

@ -75,6 +75,8 @@ void JsonRPCServer::processData(int clientId, const QByteArray &jsonData)
case DeviceManager::DeviceErrorMissingParameter:
sendErrorResponse(clientId, commandId, "Error creating device. Missing parameter.");
break;
default:
sendErrorResponse(clientId, commandId, "Unknown error.");
}
} else if (method == "GetConfiguredDevices") {
QVariantMap rspParams;
@ -157,6 +159,8 @@ void JsonRPCServer::handleActionMessage(int clientId, int commandId, const QStri
case DeviceManager::DeviceErrorDeviceNotFound:
sendErrorResponse(clientId, commandId, "No such device");
break;
default:
sendErrorResponse(clientId, commandId, "Unknown error.");
}
}
}

View File

@ -7,6 +7,7 @@ target.path = /usr/bin
INSTALLS += target
QT += network
CONFIG += c++11
LIBS += -L../libhive/ -lhive