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

Fix metatype registering for old Qt versions

Browse Source
This commit is contained in:
Michael Zanetti 2020-08-31 21:52:15 +02:00
parent 9f49187dc1
commit e50eece45c
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnymea-core/integrations/thingmanagerimplementation.cpp
View File

@ -71,9 +71,6 @@ ThingManagerImplementation::ThingManagerImplementation(HardwareManager *hardware
m_locale(locale), m_locale(locale),
m_translator(new Translator(this)) m_translator(new Translator(this))
{ {
qRegisterMetaType<ThingClassId>();
qRegisterMetaType<ThingDescriptor>();
foreach (const Interface &interface, ThingUtils::allInterfaces()) { foreach (const Interface &interface, ThingUtils::allInterfaces()) {
m_supportedInterfaces.insert(interface.name(), interface); m_supportedInterfaces.insert(interface.name(), interface);
} }

17
libnymea/integrations/thingmanager.cpp
View File

@ -47,8 +47,25 @@ ThingManager::ThingManager(QObject *parent) : QObject(parent)
{ {
qRegisterMetaType<Param>(); qRegisterMetaType<Param>();
qRegisterMetaType<ParamList>(); qRegisterMetaType<ParamList>();
qRegisterMetaType<ParamTypeId>();
qRegisterMetaType<ParamType>(); qRegisterMetaType<ParamType>();
qRegisterMetaType<ParamTypes>(); 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. /*! Connect two states.

1
tests/auto/pythonplugins/testpythonplugins.cpp
View File

@ -64,6 +64,7 @@ void TestPythonPlugins::initTestCase()
QLoggingCategory::setFilterRules("*.debug=false\n" QLoggingCategory::setFilterRules("*.debug=false\n"
"Tests.debug=true\n" "Tests.debug=true\n"
"PyMock.debug=true\n" "PyMock.debug=true\n"
"PythonIntegrations.debug=true\n"
); );
} }