Add Qt6 support

debian

@@ -0,0 +1 @@
+debian-qt5

debian-qt5/control

@@ -1,7 +1,7 @@
 Source: nymea-networkmanager
 Section: utils
 Priority: optional
-Maintainer: Simon Stürz <simon.stuerz@nymea.io>
+Maintainer: nymea GmbH <developer@nymea.io>
 Standards-Version: 4.6.0
 Build-Depends: debhelper (>= 9.0.0),
   dpkg-dev (>= 1.16.1~),
@@ -20,4 +20,4 @@ Depends: ${misc:Depends},
   libnymea-gpio
 Description: Daemon for wireless configuration using bluetooth LE.
   This daemon allows to configure a wireless network using a bluetooth
-  low energy gatt server. The tool is written in Qt 5.
+  low energy gatt server.

debian-qt5/copyright

@@ -7,5 +7,5 @@ License: GPL-3
  Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
 Files: *
-Copyright: (C) 2018 - 2024 nymea GmbH <contact@nymea.io>
+Copyright: (C) 2018 - 2025 nymea GmbH <contact@nymea.io>
 License: GPL-3

debian-qt6/changelog

@@ -0,0 +1 @@
+../debian-qt5/changelog

debian-qt6/compat

@@ -0,0 +1 @@
+13

debian-qt6/control

@@ -0,0 +1,23 @@
+Source: nymea-networkmanager
+Section: utils
+Priority: optional
+Maintainer: nymea GmbH <developer@nymea.io>
+Standards-Version: 4.7.2
+Build-Depends: debhelper,
+  dpkg-dev,
+  qt6-base-dev,
+  qt6-base-dev-tools,
+  qt6-connectivity-dev,
+  libnymea-networkmanager-dev,
+  libnymea-gpio-dev
+
+
+Package: nymea-networkmanager
+Architecture: any
+Depends: ${misc:Depends},
+  network-manager,
+  libnymea-networkmanager,
+  libnymea-gpio
+Description: Daemon for wireless configuration using bluetooth LE.
+  This daemon allows to configure a wireless network using a bluetooth
+  low energy gatt server.

debian-qt6/copyright

@@ -0,0 +1 @@
+../debian-qt5/copyright

debian-qt6/nymea-networkmanager.install

@@ -0,0 +1 @@
+../debian-qt5/nymea-networkmanager.install

debian-qt6/rules

@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+
+override_dh_missing:
+	dh_missing --list-missing
+
+override_dh_installsystemd:
+	dh_installsystemd --restart-after-upgrade
+
+%:
+	dh $@ --buildsystem=qmake6 --parallel

debian-qt6/source

@@ -0,0 +1 @@
+../debian-qt5/source

nymea-networkmanager.pri

@@ -1,5 +1,17 @@
-QMAKE_CXXFLAGS *= -Werror -std=c++1z -g
+greaterThan(QT_MAJOR_VERSION, 5) {
-QMAKE_LFLAGS *= -std=c++1z
+    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
 
 top_srcdir=$$PWD
 top_builddir=$$shadowed($$PWD)

nymea-networkmanager/main.cpp

@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
     parser.addHelpOption();
     parser.addVersionOption();
     parser.setApplicationDescription(QString("\nThis daemon allows to configure a wifi network using a bluetooth low energy connection.\n\n"
-                                             "Copyright %1 2018-2024 Simon Stürz <simon.stuerz@nymea.io>\n\n"
+                                             "Copyright %1 2018-2025 Simon Stürz <simon.stuerz@nymea.io>\n\n"
                                              "Modes: \n"
                                              "  - offline  This mode starts the bluetooth server once the device is offline\n"
                                              "             and not connected to any LAN network.\n"

nymea-networkmanager/nymea-networkmanager.pro

@@ -2,6 +2,19 @@ include(../nymea-networkmanager.pri)
 
 TARGET = nymea-networkmanager
 
+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
+}
+
 QT += core network bluetooth dbus
 QT -= gui