From ac156dd3b0ca438719cf5fba5dbb47602afef1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Wed, 20 Aug 2025 08:51:26 +0200
Subject: [PATCH] Add Qt6 support

---
 airconditioningjsonhandler.cpp              |  3 +--
 airconditioningjsonhandler.h                |  4 ++--
 airconditioningmanager.cpp                  |  7 ++++---
 nymea-experience-plugin-airconditioning.pro | 17 ++++++++++++++---
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/airconditioningjsonhandler.cpp b/airconditioningjsonhandler.cpp
index 8ac22f2..e8d0bbe 100644
--- a/airconditioningjsonhandler.cpp
+++ b/airconditioningjsonhandler.cpp
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -38,7 +38,6 @@ AirConditioningJsonHandler::AirConditioningJsonHandler(AirConditioningManager *m
     JsonHandler(parent),
     m_manager(manager)
 {
-
     registerEnum<AirConditioningManager::AirConditioningError>();
     registerFlag<ZoneInfo::ZoneStatusFlag, ZoneInfo::ZoneStatus>();
     registerEnum<ZoneInfo::SetpointOverrideMode>();
diff --git a/airconditioningjsonhandler.h b/airconditioningjsonhandler.h
index eee338f..cfc4b60 100644
--- a/airconditioningjsonhandler.h
+++ b/airconditioningjsonhandler.h
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
+* Copyright 2013 - 2025, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -33,7 +33,7 @@
 
 #include <QObject>
 
-#include "jsonrpc/jsonhandler.h"
+#include <jsonrpc/jsonhandler.h>
 
 class AirConditioningManager;
 
diff --git a/airconditioningmanager.cpp b/airconditioningmanager.cpp
index 1889201..879550f 100644
--- a/airconditioningmanager.cpp
+++ b/airconditioningmanager.cpp
@@ -87,7 +87,7 @@ QPair<AirConditioningManager::AirConditioningError, ZoneInfo> AirConditioningMan
     AirConditioningError status = verifyThingIds(thermostats, windowSensors, indoorSensors, outdoorSensors, notifications);
     if (status != AirConditioningErrorNoError) {
         qCWarning(dcAirConditioning()) << "Invalid thing id" << status << "in" << thermostats;
-        return qMakePair<AirConditioningError, ZoneInfo>(status, ZoneInfo());
+        return QPair<AirConditioningError, ZoneInfo>(status, ZoneInfo());
     }
 
     zone.setThermostats(thermostats);
@@ -100,7 +100,7 @@ QPair<AirConditioningManager::AirConditioningError, ZoneInfo> AirConditioningMan
     saveZones();
 
     emit zoneAdded(zone);
-    return qMakePair<AirConditioningError, ZoneInfo>(AirConditioningErrorNoError, zone);
+    return QPair<AirConditioningError, ZoneInfo>(AirConditioningErrorNoError, zone);
 }
 
 AirConditioningManager::AirConditioningError AirConditioningManager::removeZone(const QUuid &zoneId)
@@ -325,7 +325,8 @@ void AirConditioningManager::updateZone(const QUuid &zoneId)
 
     bool timeScheduleActive = false;
     bool overrideActive = false;
-    qCDebug(dcAirConditioning()) << "Standby temp:" << zone.standbySetpoint() << "Override:" << zone.setpointOverrideMode() << zone.setpointOverride() << zone.setpointOverrideEnd().toString(Qt::DefaultLocaleShortDate) << "Schedules:" << zone.weekSchedule();
+
+    qCDebug(dcAirConditioning()) << "Standby temp:" << zone.standbySetpoint() << "Override:" << zone.setpointOverrideMode() << zone.setpointOverride() << zone.setpointOverrideEnd().toString() << "Schedules:" << zone.weekSchedule();
 
     if (zone.setpointOverrideMode() == ZoneInfo::SetpointOverrideModeUnlimited
             || (zone.setpointOverrideMode() == ZoneInfo::SetpointOverrideModeTimed && zone.setpointOverrideEnd() > now)
diff --git a/nymea-experience-plugin-airconditioning.pro b/nymea-experience-plugin-airconditioning.pro
index 0dcec31..4bdb45d 100644
--- a/nymea-experience-plugin-airconditioning.pro
+++ b/nymea-experience-plugin-airconditioning.pro
@@ -1,14 +1,25 @@
 TEMPLATE = lib
 TARGET = $$qtLibraryTarget(nymea_experiencepluginairconditioning)
 
-CONFIG += plugin link_pkgconfig c++11
+greaterThan(QT_MAJOR_VERSION, 5) {
+    message("Building using Qt6 support")
+    CONFIG *= c++17
+    QMAKE_LFLAGS *= -std=c++17
+    QMAKE_CXXFLAGS *= -std=c++17
+} else {
+    message("Building using Qt5 support")
+    CONFIG *= c++11
+    QMAKE_LFLAGS *= -std=c++11
+    QMAKE_CXXFLAGS *= -std=c++11
+    DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x050F00
+}
+
+CONFIG += plugin link_pkgconfig
 PKGCONFIG += nymea
 
 QT -= gui
 QT += network sql
 
-include(../config.pri)
-
 HEADERS += experiencepluginairconditioning.h \
     airconditioningjsonhandler.h \
     airconditioningmanager.h \