From 22bacf09e1b281317cd52effd8317d5eb9bdb2ea Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 1 Dec 2019 01:14:26 +0100 Subject: [PATCH] fix build --- libnymea-core/logging/logengine.cpp | 2 +- libnymea-core/scriptengine/scriptengine.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libnymea-core/logging/logengine.cpp b/libnymea-core/logging/logengine.cpp index c205ab1e..588ab4c2 100644 --- a/libnymea-core/logging/logengine.cpp +++ b/libnymea-core/logging/logengine.cpp @@ -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(); }); diff --git a/libnymea-core/scriptengine/scriptengine.cpp b/libnymea-core/scriptengine/scriptengine.cpp index 51d6f694..c11b7945 100644 --- a/libnymea-core/scriptengine/scriptengine.cpp +++ b/libnymea-core/scriptengine/scriptengine.cpp @@ -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(); }