From 5f2560d3801b72c8be0eada41ab96097f045ded8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 21 Oct 2020 08:39:35 +0200 Subject: [PATCH] Fix serial port error declaration for older qt versions --- .../backends/deconz/interface/zigbeeinterfacedeconz.cpp | 4 ---- libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp | 4 ---- libnymea-zigbee/zigbeebridgecontroller.cpp | 2 +- libnymea-zigbee/zigbeebridgecontroller.h | 4 +++- nymea-zigbee.pro | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp b/libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp index 42edb15..fbb43dd 100644 --- a/libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp +++ b/libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp @@ -34,12 +34,8 @@ // SLIP: https://tools.ietf.org/html/rfc1055 -Q_DECLARE_METATYPE(QSerialPort::SerialPortError); - ZigbeeInterfaceDeconz::ZigbeeInterfaceDeconz(QObject *parent) : QObject(parent) { - qRegisterMetaType(); - m_reconnectTimer = new QTimer(this); m_reconnectTimer->setSingleShot(true); m_reconnectTimer->setInterval(5000); diff --git a/libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp b/libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp index df43daa..98eacae 100644 --- a/libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp +++ b/libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp @@ -34,12 +34,8 @@ // SLIP: https://tools.ietf.org/html/rfc1055 -Q_DECLARE_METATYPE(QSerialPort::SerialPortError); - ZigbeeInterfaceNxp::ZigbeeInterfaceNxp(QObject *parent) : QObject(parent) { - qRegisterMetaType(); - m_reconnectTimer = new QTimer(this); m_reconnectTimer->setSingleShot(true); m_reconnectTimer->setInterval(5000); diff --git a/libnymea-zigbee/zigbeebridgecontroller.cpp b/libnymea-zigbee/zigbeebridgecontroller.cpp index 58220c4..004ad82 100644 --- a/libnymea-zigbee/zigbeebridgecontroller.cpp +++ b/libnymea-zigbee/zigbeebridgecontroller.cpp @@ -30,7 +30,7 @@ ZigbeeBridgeController::ZigbeeBridgeController(QObject *parent) : QObject(parent) { - + qRegisterMetaType(); } QString ZigbeeBridgeController::firmwareVersion() const diff --git a/libnymea-zigbee/zigbeebridgecontroller.h b/libnymea-zigbee/zigbeebridgecontroller.h index 7db5087..ac54e34 100644 --- a/libnymea-zigbee/zigbeebridgecontroller.h +++ b/libnymea-zigbee/zigbeebridgecontroller.h @@ -29,9 +29,11 @@ #define ZIGBEEBRIDGECONTROLLER_H #include - +#include #include "zigbee.h" +Q_DECLARE_METATYPE(QSerialPort::SerialPortError); + class ZigbeeBridgeController : public QObject { Q_OBJECT diff --git a/nymea-zigbee.pro b/nymea-zigbee.pro index dbc7bcb..f2af4eb 100644 --- a/nymea-zigbee.pro +++ b/nymea-zigbee.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += libnymea-zigbee zigbee-cli +SUBDIRS += libnymea-zigbee #zigbee-cli