From e5413a89500c32d0f403b698994b855537eb33e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Mon, 11 Aug 2025 14:48:11 +0200
Subject: [PATCH] tuya: Add Qt6 support

---
 tuya/integrationplugintuya.cpp | 8 ++++----
 tuya/integrationplugintuya.h   | 8 ++++----
 tuya/tuya.pro                  | 8 +++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/tuya/integrationplugintuya.cpp b/tuya/integrationplugintuya.cpp
index c3dab1b4..487bb214 100644
--- a/tuya/integrationplugintuya.cpp
+++ b/tuya/integrationplugintuya.cpp
@@ -36,10 +36,10 @@
 #include <QJsonDocument>
 #include <QColor>
 
-#include "hardwaremanager.h"
-#include "network/networkaccessmanager.h"
+#include <hardwaremanager.h>
+#include <network/networkaccessmanager.h>
 
-#include "plugintimer.h"
+#include <plugintimer.h>
 
 // API info:
 // Python project: https://github.com/PaulAnnekov/tuyaha
@@ -547,7 +547,7 @@ void IntegrationPluginTuya::queryDevice(Thing *thing)
 
     QNetworkReply *reply = hardwareManager()->networkManager()->post(request, jsonDoc.toJson(QJsonDocument::Compact));
     connect(reply, &QNetworkReply::finished, [reply](){reply->deleteLater();});
-    connect(reply, &QNetworkReply::finished, thing, [this, thing, reply](){
+    connect(reply, &QNetworkReply::finished, thing, [thing, reply](){
         if (reply->error() !=  QNetworkReply::NoError) {
             qCWarning(dcTuya()) << "Error fetching devices from Tuya cloud" << reply->error();
             return;
diff --git a/tuya/integrationplugintuya.h b/tuya/integrationplugintuya.h
index f2d3bbe3..a9fde2dc 100644
--- a/tuya/integrationplugintuya.h
+++ b/tuya/integrationplugintuya.h
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2020, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -33,7 +33,7 @@
 
 #include <QTimer>
 
-#include "integrations/integrationplugin.h"
+#include <integrations/integrationplugin.h>
 
 class PluginTimer;
 
@@ -66,11 +66,11 @@ private:
 
     void controlTuyaSwitch(const QString &devId, const QString &command, const QVariant &value, ThingActionInfo *info);
 
-    QHash<ThingId, QTimer*> m_tokenExpiryTimers;
+    QHash<ThingId, QTimer *> m_tokenExpiryTimers;
     PluginTimer *m_pluginTimerQuery = nullptr;
     PluginTimer *m_pluginTimerDiscovery = nullptr;
 
-    QHash<Thing*, QList<Thing*>> m_pollQueue;
+    QHash<Thing *, QList<Thing *>> m_pollQueue;
 };
 
 #endif // INTEGRATIONPLUGINTUYA_H
diff --git a/tuya/tuya.pro b/tuya/tuya.pro
index 92220a64..2dfcfcb6 100644
--- a/tuya/tuya.pro
+++ b/tuya/tuya.pro
@@ -1,13 +1,11 @@
 include(../plugins.pri)
 
-QT += network
+QT *= network
 
 PKGCONFIG += nymea-mqtt
 
-TARGET = $$qtLibraryTarget(nymea_integrationplugintuya)
-
 SOURCES += \
-    integrationplugintuya.cpp \
+    integrationplugintuya.cpp
 
 HEADERS += \
-    integrationplugintuya.h \
+    integrationplugintuya.h