ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some more paths

pull/135/head
Michael Zanetti 2017-07-22 17:29:48 +02:00
parent 4e47a28267
commit 2677ad0afd
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
debian/copyright vendored
View File

@ -56,24 +56,3 @@ Files: plugins/*
License: LGPL-2.1
Copyright: 2014-2017, Simon Stürz <simon.stuerz@guh.io>
2014, Michael Zanetti <michael_zanetti@gmx.net>
Files: plugins/deviceplugins/denon/*
plugins/deviceplugins/orderbutton/*
plugins/deviceplugins/ws2812/*
License: LGPL-2.1
Copyright: 2016, Bernhard Trinnes <bernhard.trinnes@guh.io>
Files: plugins/deviceplugins/plantcare/*
License: LGPL-2.1
Copyright: 2016-2017, Simon Stürz <simon.stuerz@guh.io>
2016, Bernhard Trinnes <bernhard.trinnes@guh.io>
Files: plugins/deviceplugins/pushbullet/*
plugins/deviceplugins/usbwde/*
License: LGPL-2.1
Copyright: 2016, Alexander Lampret <alexander.lampret@gmail.com>
Files: plugins/deviceplugins/multisensor/*
License: LGPL-2.1
Copyright: 2016-2017, Simon Stürz <simon.stuerz@guh.io>
2016-2017, Gil Benkö

3
libguh/devicemanager.cpp
View File

@ -263,8 +263,7 @@ QStringList DeviceManager::pluginSearchDirs()
}
searchDirs << QCoreApplication::applicationDirPath() + "/../lib/guh/plugins";
searchDirs << QCoreApplication::applicationDirPath() + "/../plugins/";
searchDirs << QCoreApplication::applicationDirPath() + "/../plugins/deviceplugins";
searchDirs << QCoreApplication::applicationDirPath() + "/../../../plugins/deviceplugins";
searchDirs << QCoreApplication::applicationDirPath() + "/../../../plugins/";
searchDirs << QString("%1").arg(GUH_PLUGINS_PATH);
#ifdef SNAPPY
searchDirs << QString("%1%2").arg(QString::fromUtf8(qgetenv("SNAP"))).arg(GUH_PLUGINS_PATH);

2
plugins/mock/devicepluginmock.cpp
View File

@ -37,7 +37,7 @@
For more details how to read this JSON file please check out the documentation for \l{The plugin JSON File}.
\quotefile plugins/deviceplugins/mailnotification/devicepluginmailnotification.json
\quotefile plugins/mock/devicepluginmock.json
*/
#include "devicepluginmock.h"