From 59236e318a80c25f2909ba37ddb6b1297b8e1401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Fri, 4 Oct 2024 10:03:35 +0200
Subject: [PATCH] Fix building and linking Qt6 and disable TI everywhere until
 it can be fixed

---
 libnymea-zigbee/libnymea-zigbee.pro          | 1 +
 libnymea-zigbee/zigbee.h                     | 2 ++
 libnymea-zigbee/zigbeenetworkmanager.cpp     | 4 ++++
 libnymea-zigbee/zigbeeuartadaptermonitor.cpp | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/libnymea-zigbee/libnymea-zigbee.pro b/libnymea-zigbee/libnymea-zigbee.pro
index e79436c..643c1c5 100644
--- a/libnymea-zigbee/libnymea-zigbee.pro
+++ b/libnymea-zigbee/libnymea-zigbee.pro
@@ -14,6 +14,7 @@ packagesExist(libudev) {
 greaterThan(QT_MAJOR_VERSION, 5) {
     # Note: available since mantic
     # PKGCONFIG += qca2-qt6
+    message(Building without TI support)
     DEFINES += DISABLE_TI
 } else {
     PKGCONFIG += qca2-qt5
diff --git a/libnymea-zigbee/zigbee.h b/libnymea-zigbee/zigbee.h
index d414c0f..7b093c5 100644
--- a/libnymea-zigbee/zigbee.h
+++ b/libnymea-zigbee/zigbee.h
@@ -43,7 +43,9 @@ public:
     enum ZigbeeBackendType {
         ZigbeeBackendTypeDeconz,
         ZigbeeBackendTypeNxp,
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         ZigbeeBackendTypeTi
+#endif
     };
     Q_ENUM(ZigbeeBackendType)
 
diff --git a/libnymea-zigbee/zigbeenetworkmanager.cpp b/libnymea-zigbee/zigbeenetworkmanager.cpp
index 492b8ee..cca7b3f 100644
--- a/libnymea-zigbee/zigbeenetworkmanager.cpp
+++ b/libnymea-zigbee/zigbeenetworkmanager.cpp
@@ -30,7 +30,9 @@
 
 #include "backends/nxp/zigbeenetworknxp.h"
 #include "backends/deconz/zigbeenetworkdeconz.h"
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include "backends/ti/zigbeenetworkti.h"
+#endif
 
 #include <QDateTime>
 
@@ -49,8 +51,10 @@ ZigbeeNetwork *ZigbeeNetworkManager::createZigbeeNetwork(const QUuid &networkUui
         return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkNxp(networkUuid, parent));
     case Zigbee::ZigbeeBackendTypeDeconz:
         return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkDeconz(networkUuid, parent));
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     case Zigbee::ZigbeeBackendTypeTi:
         return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkTi(networkUuid, parent));
+#endif
     }
 
     return nullptr;
diff --git a/libnymea-zigbee/zigbeeuartadaptermonitor.cpp b/libnymea-zigbee/zigbeeuartadaptermonitor.cpp
index fe6173a..785d8ee 100644
--- a/libnymea-zigbee/zigbeeuartadaptermonitor.cpp
+++ b/libnymea-zigbee/zigbeeuartadaptermonitor.cpp
@@ -238,12 +238,15 @@ void ZigbeeUartAdapterMonitor::addAdapterInternally(const QString &serialPort)
             adapter.setBackendType(Zigbee::ZigbeeBackendTypeNxp);
             adapter.setBaudRate(115200);
         }
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         QStringList zStackModels = {"cc2530", "cc2531", "cc2538", "cc1352p", "cc2652p", "cc2652r", "cc2652rb", "sonoff zigbee 3.0 usb"};
         if (QRegularExpression(".*(" + zStackModels.join("|") + ").*").match(serialPortInfo.description().toLower()).hasMatch()) {
             adapter.setHardwareRecognized(true);
             adapter.setBackendType(Zigbee::ZigbeeBackendTypeTi);
             adapter.setBaudRate(115200);
         }
+#endif
 
         qCDebug(dcZigbeeAdapterMonitor()) << "Added" << adapter;
         m_availableAdapters.insert(adapter.serialPort(), adapter);