From f848502467348769a632142581e2acb95d72eb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 7 Aug 2025 15:47:15 +0200 Subject: [PATCH] bosswerk: Add Qt6 support --- bosswerk/bosswerk.pro | 6 +++--- bosswerk/integrationpluginbosswerk.cpp | 6 ++---- bosswerk/integrationpluginbosswerk.h | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/bosswerk/bosswerk.pro b/bosswerk/bosswerk.pro index e3a95cdb..65870a85 100644 --- a/bosswerk/bosswerk.pro +++ b/bosswerk/bosswerk.pro @@ -1,9 +1,9 @@ include(../plugins.pri) -QT += network +QT *= network SOURCES += \ - integrationpluginbosswerk.cpp \ + integrationpluginbosswerk.cpp HEADERS += \ - integrationpluginbosswerk.h \ + integrationpluginbosswerk.h diff --git a/bosswerk/integrationpluginbosswerk.cpp b/bosswerk/integrationpluginbosswerk.cpp index 4ef9f9c3..26c7d580 100644 --- a/bosswerk/integrationpluginbosswerk.cpp +++ b/bosswerk/integrationpluginbosswerk.cpp @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -* Copyright 2013 - 2024, nymea GmbH +* Copyright 2013 - 2025, nymea GmbH * Contact: contact@nymea.io * * This file is part of nymea. @@ -28,7 +28,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - #include "integrationpluginbosswerk.h" #include "plugininfo.h" @@ -71,8 +70,7 @@ void IntegrationPluginBosswerk::discoverThings(ThingDiscoveryInfo *info) QUrl url("http://" + address.toString() + "/status.html"); QNetworkRequest request(url); - - QNetworkReply *probeReply = hardwareManager()->networkManager()->get(QNetworkRequest(url)); + QNetworkReply *probeReply = hardwareManager()->networkManager()->get(request); connect(probeReply, &QNetworkReply::finished, probeReply, &QNetworkReply::deleteLater); connect(probeReply, &QNetworkReply::finished, info, [probeReply, address, this](){ QByteArray data = probeReply->readAll(); diff --git a/bosswerk/integrationpluginbosswerk.h b/bosswerk/integrationpluginbosswerk.h index d2670bbd..d0ae6e14 100644 --- a/bosswerk/integrationpluginbosswerk.h +++ b/bosswerk/integrationpluginbosswerk.h @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -* Copyright 2013 - 2024, nymea GmbH +* Copyright 2013 - 2025, nymea GmbH * Contact: contact@nymea.io * * This file is part of nymea. @@ -31,7 +31,7 @@ #ifndef INTEGRATIONPLUGINMEROSS_H #define INTEGRATIONPLUGINMEROSS_H -#include "integrations/integrationplugin.h" +#include #include "extern-plugininfo.h" #include