From e50eece45c3290d93c9f1d8fe066162c02aefefe Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 31 Aug 2020 21:52:15 +0200
Subject: [PATCH] Fix metatype registering for old Qt versions

---
 .../integrations/thingmanagerimplementation.cpp |  3 ---
 libnymea/integrations/thingmanager.cpp          | 17 +++++++++++++++++
 tests/auto/pythonplugins/testpythonplugins.cpp  |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/libnymea-core/integrations/thingmanagerimplementation.cpp b/libnymea-core/integrations/thingmanagerimplementation.cpp
index bd4b5a65..3dcd4576 100644
--- a/libnymea-core/integrations/thingmanagerimplementation.cpp
+++ b/libnymea-core/integrations/thingmanagerimplementation.cpp
@@ -71,9 +71,6 @@ ThingManagerImplementation::ThingManagerImplementation(HardwareManager *hardware
     m_locale(locale),
     m_translator(new Translator(this))
 {
-    qRegisterMetaType<ThingClassId>();
-    qRegisterMetaType<ThingDescriptor>();
-
     foreach (const Interface &interface, ThingUtils::allInterfaces()) {
         m_supportedInterfaces.insert(interface.name(), interface);
     }
diff --git a/libnymea/integrations/thingmanager.cpp b/libnymea/integrations/thingmanager.cpp
index ae02ed1a..5053d861 100644
--- a/libnymea/integrations/thingmanager.cpp
+++ b/libnymea/integrations/thingmanager.cpp
@@ -47,8 +47,25 @@ ThingManager::ThingManager(QObject *parent) : QObject(parent)
 {
     qRegisterMetaType<Param>();
     qRegisterMetaType<ParamList>();
+    qRegisterMetaType<ParamTypeId>();
     qRegisterMetaType<ParamType>();
     qRegisterMetaType<ParamTypes>();
+    qRegisterMetaType<StateTypeId>();
+    qRegisterMetaType<StateType>();
+    qRegisterMetaType<StateTypes>();
+    qRegisterMetaType<EventTypeId>();
+    qRegisterMetaType<EventType>();
+    qRegisterMetaType<EventTypes>();
+    qRegisterMetaType<ActionTypeId>();
+    qRegisterMetaType<ActionType>();
+    qRegisterMetaType<ActionTypes>();
+    qRegisterMetaType<ThingClassId>();
+    qRegisterMetaType<ThingClass>();
+    qRegisterMetaType<ThingClasses>();
+    qRegisterMetaType<ThingDescriptorId>();
+    qRegisterMetaType<ThingDescriptor>();
+    qRegisterMetaType<ThingDescriptors>();
+    qRegisterMetaType<Thing::ThingError>();
 }
 
 /*! Connect two states.
diff --git a/tests/auto/pythonplugins/testpythonplugins.cpp b/tests/auto/pythonplugins/testpythonplugins.cpp
index e3b08b4e..c15dd764 100644
--- a/tests/auto/pythonplugins/testpythonplugins.cpp
+++ b/tests/auto/pythonplugins/testpythonplugins.cpp
@@ -64,6 +64,7 @@ void TestPythonPlugins::initTestCase()
     QLoggingCategory::setFilterRules("*.debug=false\n"
                                      "Tests.debug=true\n"
                                      "PyMock.debug=true\n"
+                                     "PythonIntegrations.debug=true\n"
                                      );
 }