ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Require Qt 5.12 for ScriptDevicePlugin

Browse Source
This commit is contained in:
Michael Zanetti 2019-11-12 23:52:24 +01:00
parent 4c0c95b1a8
commit 0f75be0fa4
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/devices/devicemanagerimplementation.cpp
View File

@ -23,7 +23,9 @@
#include "devicemanagerimplementation.h" #include "devicemanagerimplementation.h"
#include "translator.h" #include "translator.h"
#if QT_VERSION >= QT_VERSION_CHECK(5,12,0)
#include "scriptdeviceplugin.h" #include "scriptdeviceplugin.h"
#endif
#include "loggingcategories.h" #include "loggingcategories.h"
#include "typeutils.h" #include "typeutils.h"
@ -1118,6 +1120,7 @@ void DeviceManagerImplementation::loadPlugins()
} }
} }
#if QT_VERSION >= QT_VERSION_CHECK(5,12,0)
foreach (const QString &path, pluginSearchDirs()) { foreach (const QString &path, pluginSearchDirs()) {
QDir dir(path); QDir dir(path);
qCDebug(dcDeviceManager) << "Loading JS plugins from:" << dir.absolutePath(); qCDebug(dcDeviceManager) << "Loading JS plugins from:" << dir.absolutePath();
@ -1152,6 +1155,7 @@ void DeviceManagerImplementation::loadPlugins()
loadPlugin(plugin, metaData); loadPlugin(plugin, metaData);
} }
} }
#endif
} }
void DeviceManagerImplementation::loadPlugin(DevicePlugin *pluginIface, const PluginMetadata &metaData) void DeviceManagerImplementation::loadPlugin(DevicePlugin *pluginIface, const PluginMetadata &metaData)

10
libnymea-core/libnymea-core.pro
View File

@ -17,7 +17,6 @@ RESOURCES += $$top_srcdir/icons.qrc \
HEADERS += nymeacore.h \ HEADERS += nymeacore.h \
devices/devicemanagerimplementation.h \ devices/devicemanagerimplementation.h \
devices/scriptdeviceplugin.h \
devices/translator.h \ devices/translator.h \
experiences/experiencemanager.h \ experiences/experiencemanager.h \
jsonrpc/jsonrpcserverimplementation.h \ jsonrpc/jsonrpcserverimplementation.h \
@ -93,7 +92,6 @@ HEADERS += nymeacore.h \
SOURCES += nymeacore.cpp \ SOURCES += nymeacore.cpp \
devices/devicemanagerimplementation.cpp \ devices/devicemanagerimplementation.cpp \
devices/scriptdeviceplugin.cpp \
devices/translator.cpp \ devices/translator.cpp \
experiences/experiencemanager.cpp \ experiences/experiencemanager.cpp \
jsonrpc/jsonrpcserverimplementation.cpp \ jsonrpc/jsonrpcserverimplementation.cpp \
@ -164,3 +162,11 @@ SOURCES += nymeacore.cpp \
debugreportgenerator.cpp \ debugreportgenerator.cpp \
platform/platform.cpp \ platform/platform.cpp \
jsonrpc/systemhandler.cpp jsonrpc/systemhandler.cpp
versionAtLeast(QT_VERSION, 5.12.0) {
HEADERS += \
devices/scriptdeviceplugin.h \
SOURCES += \
devices/scriptdeviceplugin.cpp \
}