From 5bd0a413f1b986b5535a52d39ffbc0d13943b248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Fri, 19 Jan 2024 11:23:37 +0100
Subject: [PATCH] Add Qt6 support

---
 .../libnymea-networkmanager.pro                  | 16 ++++++++++++++--
 libnymea-networkmanager/networkconnection.cpp    |  4 ++--
 libnymea-networkmanager/networkmanager.cpp       |  7 ++++---
 libnymea-networkmanager/wirelessnetworkdevice.h  |  1 +
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/libnymea-networkmanager/libnymea-networkmanager.pro b/libnymea-networkmanager/libnymea-networkmanager.pro
index 3463fe6..57b22d1 100644
--- a/libnymea-networkmanager/libnymea-networkmanager.pro
+++ b/libnymea-networkmanager/libnymea-networkmanager.pro
@@ -3,8 +3,20 @@ TEMPLATE = lib
 
 QT += dbus network
 
-QMAKE_CXXFLAGS *= -Werror -std=c++11 -g
-QMAKE_LFLAGS *= -std=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
+}
+
+QMAKE_CXXFLAGS *= -Werror -g
 
 DEFINES += VERSION_STRING=\\\"$${VERSION_STRING}\\\"
 
diff --git a/libnymea-networkmanager/networkconnection.cpp b/libnymea-networkmanager/networkconnection.cpp
index 8644425..979e5a2 100644
--- a/libnymea-networkmanager/networkconnection.cpp
+++ b/libnymea-networkmanager/networkconnection.cpp
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2020, nymea GmbH
+* Copyright 2013 - 2024, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -137,7 +137,7 @@ bool NetworkConnection::autoconnect() const
 /*! Returns the timestamp of this \l{NetworkConnection} from the last connection. */
 QDateTime NetworkConnection::timeStamp() const
 {
-    return QDateTime::fromTime_t(m_connectionSettings.value("connection").value("timestamp").toUInt());
+    return QDateTime::fromSecsSinceEpoch(m_connectionSettings.value("connection").value("timestamp").toUInt());
 }
 
 QDebug operator<<(QDebug debug, NetworkConnection *networkConnection)
diff --git a/libnymea-networkmanager/networkmanager.cpp b/libnymea-networkmanager/networkmanager.cpp
index d5a19fa..c6d2189 100644
--- a/libnymea-networkmanager/networkmanager.cpp
+++ b/libnymea-networkmanager/networkmanager.cpp
@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2020, nymea GmbH
+* Copyright 2013 - 2024, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -45,6 +45,7 @@
 #include <QDebug>
 #include <QTimer>
 #include <QMetaEnum>
+#include <QRegularExpression>
 
 #include <arpa/inet.h>
 
@@ -346,7 +347,7 @@ NetworkManager::NetworkManagerError NetworkManager::createWiredAutoConnection(co
     QVariantMap connectionSettings {
         {"id", "auto"},
         {"autoconnect", true},
-        {"uuid", QUuid::createUuid().toString().remove(QRegExp("[{}]"))},
+        {"uuid", QUuid::createUuid().toString().remove(QRegularExpression("[{}]"))},
         {"type", "802-3-ethernet"}
     };
 
@@ -411,7 +412,7 @@ NetworkManager::NetworkManagerError NetworkManager::createWiredManualConnection(
     QVariantMap connectionSettings {
         {"id", "manual"},
         {"autoconnect", true},
-        {"uuid", QUuid::createUuid().toString().remove(QRegExp("[{}]"))},
+        {"uuid", QUuid::createUuid().toString().remove(QRegularExpression("[{}]"))},
         {"type", "802-3-ethernet"}
     };
 
diff --git a/libnymea-networkmanager/wirelessnetworkdevice.h b/libnymea-networkmanager/wirelessnetworkdevice.h
index 4b0280e..fdff54c 100644
--- a/libnymea-networkmanager/wirelessnetworkdevice.h
+++ b/libnymea-networkmanager/wirelessnetworkdevice.h
@@ -69,6 +69,7 @@ public:
         WirelessCapability5Ghz = 0x0400,
     };
     Q_ENUM(WirelessCapability)
+
     Q_DECLARE_FLAGS(WirelessCapabilities, WirelessCapability)
     Q_FLAG(WirelessCapabilities)