Make it build with Qt 5.5

2019-11-27 19:35:31 +01:00 · 2019-11-27 19:35:31 +01:00 · ebf4d83286
commit ebf4d83286
parent 22f7654444
5 changed files with 8 additions and 2 deletions
--- a/libnymea-core/scriptengine/scriptaction.cpp
+++ b/libnymea-core/scriptengine/scriptaction.cpp
@ -4,6 +4,7 @@
 #include "types/action.h"

 #include <QQmlEngine>
+#include <qqml.h>

 #include "loggingcategories.h"

--- a/libnymea-core/scriptengine/scriptevent.cpp
+++ b/libnymea-core/scriptengine/scriptevent.cpp
@ -1,5 +1,8 @@
 #include "scriptevent.h"

+#include <qqml.h>
+#include <QQmlEngine>
+
 namespace nymeaserver {

 ScriptEvent::ScriptEvent(QObject *parent) : QObject(parent)
--- a/libnymea-core/scriptengine/scriptevent.h
+++ b/libnymea-core/scriptengine/scriptevent.h
@ -3,7 +3,7 @@

 #include <QObject>
 #include <QUuid>
-#include <QQmlEngine>
+#include <QQmlParserStatus>

 #include "types/event.h"
 #include "devices/devicemanager.h"
--- a/libnymea-core/scriptengine/scriptstate.cpp
+++ b/libnymea-core/scriptengine/scriptstate.cpp
@ -3,6 +3,8 @@
 #include "loggingcategories.h"

 #include <QColor>
+#include <qqml.h>
+#include <QQmlEngine>

 namespace nymeaserver {

--- a/libnymea-core/scriptengine/scriptstate.h
+++ b/libnymea-core/scriptengine/scriptstate.h
@ -2,7 +2,7 @@
 #define SCRIPTSTATE_H

 #include <QObject>
-#include <QQmlEngine>
+#include <QQmlParserStatus>
 #include <QPointer>

 #include "devices/devicemanager.h"