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

fix build

pull/231/head
Michael Zanetti 2019-12-01 01:14:26 +01:00
parent 5a36c2347f
commit 22bacf09e1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-core/logging/logengine.cpp
View File

@ -267,7 +267,7 @@ DevicesFetchJob *LogEngine::fetchDevices()
}
foreach (const QSqlRecord &result, job->results()) {
fetchJob->m_results.append(DeviceId::fromUuid(result.value("deviceId").toUuid()));
fetchJob->m_results.append(DeviceId(result.value("deviceId").toUuid()));
}
fetchJob->finished();
});

8
libnymea-core/scriptengine/scriptengine.cpp
View File

@ -61,7 +61,13 @@ ScriptEngine::ScriptEngine(DeviceManager *deviceManager, QObject *parent) : QObj
foreach (const QQmlError &warning, warnings) {
QMessageLogContext ctx(warning.url().toString().toUtf8(), warning.line(), "", "ScriptEngine");
// Send to script logs
onScriptMessage(warning.messageType(), ctx, warning.description());
onScriptMessage(
#if QT_VERSION >= QT_VERSION_CHECK(5,9,0)
warning.messageType(),
#else
QtMsgType::QtWarningMsg,
#endif
ctx, warning.description());
// and to logging system
qCWarning(dcScriptEngine()) << warning.toString();
}