Qt6 compile fix

Change-Id: Iad6a4fa302ca7c79abd030866876b6df3b818652
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

25 files changed, 33 insertions, 27 deletions

diff --git a/examples/knx/device/mainwindow.cpp b/examples/knx/device/mainwindow.cpp
index f1516a2..d5dd1cf 100644
--- a/examples/knx/device/mainwindow.cpp
+++ b/examples/knx/device/mainwindow.cpp
@@ -312,7 +312,7 @@ void MainWindow::setupInterfaces()
     }
     ui->interfaces->setCurrentIndex(bool(ui->interfaces->count()));
 
-    connect(ui->interfaces, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [&](int i) {
+    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i, const QString &) {
         if (i < 0)
             return;
         m_discoveryAgent.stop();
diff --git a/examples/knx/feature/mainwindow.cpp b/examples/knx/feature/mainwindow.cpp
index 8f32b06..97265a9 100644
--- a/examples/knx/feature/mainwindow.cpp
+++ b/examples/knx/feature/mainwindow.cpp
@@ -281,7 +281,7 @@ void MainWindow::setupInterfaces()
     }
     ui->interfaces->setCurrentIndex(bool(ui->interfaces->count()));
 
-    connect(ui->interfaces, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [&](int i) {
+    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i, const QString &) {
         if (i < 0)
             return;
         m_discoveryAgent.stop();
diff --git a/examples/knx/group/mainwindow.cpp b/examples/knx/group/mainwindow.cpp
index 2e297af..2ba3300 100644
--- a/examples/knx/group/mainwindow.cpp
+++ b/examples/knx/group/mainwindow.cpp
@@ -289,7 +289,7 @@ void MainWindow::setupInterfaces()
     }
     ui->interfaces->setCurrentIndex(bool(ui->interfaces->count()));
 
-    connect(ui->interfaces, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [&](int i) {
+    connect(ui->interfaces, &QComboBox::currentIndexChanged, this, [&](int i, const QString &) {
         if (i < 0)
             return;
         m_discoveryAgent.stop();
diff --git a/examples/knx/knxeditor/localdevicemanagement.cpp b/examples/knx/knxeditor/localdevicemanagement.cpp
index dd52493..f0bdc10 100644
--- a/examples/knx/knxeditor/localdevicemanagement.cpp
+++ b/examples/knx/knxeditor/localdevicemanagement.cpp
@@ -58,6 +58,7 @@
 #include <QMetaEnum>
 #include <QMetaType>
 #include <QTreeWidget>
+#include <QRegularExpressionValidator>
 
 LocalDeviceManagement::LocalDeviceManagement(QWidget* parent)
     : QWidget(parent)
@@ -150,8 +151,8 @@ LocalDeviceManagement::LocalDeviceManagement(QWidget* parent)
             ui->textOuputDeviceManagement->append(errorString);
     });
 
-    ui->cemiData->setValidator(new QRegExpValidator(QRegExp("[0-9a-fA-F]+")));
-    ui->cemiFrame->setValidator(new QRegExpValidator(QRegExp("[0-9a-fA-F]+")));
+    ui->cemiData->setValidator(new QRegularExpressionValidator(QRegularExpression("[0-9a-fA-F]+")));
+    ui->cemiFrame->setValidator(new QRegularExpressionValidator(QRegularExpression("[0-9a-fA-F]+")));
 }
 
 LocalDeviceManagement::~LocalDeviceManagement()
diff --git a/examples/knx/knxeditor/mainwindow.cpp b/examples/knx/knxeditor/mainwindow.cpp
index c967ca2..554c4a7 100644
--- a/examples/knx/knxeditor/mainwindow.cpp
+++ b/examples/knx/knxeditor/mainwindow.cpp
@@ -147,10 +147,8 @@ MainWindow::MainWindow(QWidget *parent)
         ui->tunnelingFeatures->setNatAware(checked);
     });
 
-    connect(ui->localIpBox, QOverload<int>::of(&QComboBox::activated), this,
-        &MainWindow::newIPAddressSelected);
-    connect(ui->serverBox, QOverload<int>::of(&QComboBox::activated), this,
-        &MainWindow::newServerSelected);
+    connect(ui->localIpBox, &QComboBox::activated, this, &MainWindow::newIPAddressSelected);
+    connect(ui->serverBox, &QComboBox::activated, this, &MainWindow::newServerSelected);
 
     connect(ui->actionExit, &QAction::triggered, this, &QApplication::quit);
     connect(ui->actionClear_Output, &QAction::triggered, ui->outputEdit, &QTextEdit::clear);
diff --git a/examples/knx/knxeditor/tunneling.cpp b/examples/knx/knxeditor/tunneling.cpp
index 6a5e967..ae245ec 100644
--- a/examples/knx/knxeditor/tunneling.cpp
+++ b/examples/knx/knxeditor/tunneling.cpp
@@ -58,6 +58,7 @@
 #include <QStandardItemModel>
 #include <QTreeView>
 #include <QTreeWidget>
+#include <QRegularExpressionValidator>
 
 // -- KnxAddressValidator
 
@@ -245,8 +246,8 @@ Tunneling::Tunneling(QWidget* parent)
 
     ui->destAddress->setValidator(new KnxAddressValidator(QLatin1Char('/')));
     ui->sourceAddress->setValidator(new KnxAddressValidator(QLatin1Char('.')));
-    ui->data->setValidator(new QRegExpValidator(QRegExp("[0-9a-fA-F]+")));
-    ui->additionallnfoData->setValidator(new QRegExpValidator(QRegExp("[0-9a-fA-F]+")));
+    ui->data->setValidator(new QRegularExpressionValidator(QRegularExpression("[0-9a-fA-F]+")));
+    ui->additionallnfoData->setValidator(new QRegularExpressionValidator(QRegularExpression("[0-9a-fA-F]+")));
 }
 
 Tunneling::~Tunneling()
diff --git a/examples/knx/knxproj/knxproj.pro b/examples/knx/knxproj/knxproj.pro
index af13a69..6313112 100644
--- a/examples/knx/knxproj/knxproj.pro
+++ b/examples/knx/knxproj/knxproj.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = knxproj
 CONFIG += c++11 console
 
-QT = core knx
+QT = core knx network
 INCLUDEPATH += .
 
 SOURCES += main.cpp
diff --git a/src/knx/knxproj/qknxbuildings_p.h b/src/knx/knxproj/qknxbuildings_p.h
index 5d2ad09..8ea1027 100644
--- a/src/knx/knxproj/qknxbuildings_p.h
+++ b/src/knx/knxproj/qknxbuildings_p.h
@@ -89,6 +89,8 @@ struct Q_KNX_EXPORT QKnxBuildingPart
     Q_DECLARE_TR_FUNCTIONS(QKnxBuildingPart)
 
 public:
+    ~QKnxBuildingPart() noexcept = default;
+
     QString Id; // non-colonized name, pattern [\i-[:]][\c-[:]]*
     QString Name; // 255 character max.
     QString Type; // Building, BuildingPart, Floor, Room, DistributionBoard, Stairway, Corridor
diff --git a/src/knx/knxproj/qknxgroupaddresses_p.h b/src/knx/knxproj/qknxgroupaddresses_p.h
index 3bace75..5e99364 100644
--- a/src/knx/knxproj/qknxgroupaddresses_p.h
+++ b/src/knx/knxproj/qknxgroupaddresses_p.h
@@ -98,6 +98,8 @@ struct Q_KNX_EXPORT QKnxGroupRange
     Q_DECLARE_TR_FUNCTIONS(QKnxGroupRange)
 
 public:
+    ~QKnxGroupRange() noexcept = default;
+
     QString Id; // non-colonized name, pattern [\i-[:]][\c-[:]]*
     QString Name; // 255 character max.
     quint16 RangeStart { 0 };
diff --git a/src/knx/knxproj/qknxinstallation_p.h b/src/knx/knxproj/qknxinstallation_p.h
index f2c4a6a..7ce9faf 100644
--- a/src/knx/knxproj/qknxinstallation_p.h
+++ b/src/knx/knxproj/qknxinstallation_p.h
@@ -56,6 +56,8 @@ struct Q_KNX_EXPORT QKnxTrade
     Q_DECLARE_TR_FUNCTIONS(QKnxTrade)
 
 public:
+    ~QKnxTrade() noexcept = default;
+
     QString Id; // optional, non-colonized name, pattern [\i-[:]][\c-[:]]*
     QString Name; // 255 character max.
     QString Number; // optional, 255 character max.
diff --git a/tests/auto/qknxaddress/qknxaddress.pro b/tests/auto/qknxaddress/qknxaddress.pro
index 60e99b7..983dc07 100644
--- a/tests/auto/qknxaddress/qknxaddress.pro
+++ b/tests/auto/qknxaddress/qknxaddress.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxaddress
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxcontrolfield/qknxcontrolfield.pro b/tests/auto/qknxcontrolfield/qknxcontrolfield.pro
index f38099e..5817465 100644
--- a/tests/auto/qknxcontrolfield/qknxcontrolfield.pro
+++ b/tests/auto/qknxcontrolfield/qknxcontrolfield.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxcontrolfield
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxcryptographicengine/qknxcryptographicengine.pro b/tests/auto/qknxcryptographicengine/qknxcryptographicengine.pro
index 5b9b9bb..cac06c3 100644
--- a/tests/auto/qknxcryptographicengine/qknxcryptographicengine.pro
+++ b/tests/auto/qknxcryptographicengine/qknxcryptographicengine.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxcryptographicengine
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxdatapointtype/qknxdatapointtype.pro b/tests/auto/qknxdatapointtype/qknxdatapointtype.pro
index ac25706..4d6513f 100644
--- a/tests/auto/qknxdatapointtype/qknxdatapointtype.pro
+++ b/tests/auto/qknxdatapointtype/qknxdatapointtype.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxdatapointtype
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxgroupaddressinfo/qknxgroupaddressinfo.pro b/tests/auto/qknxgroupaddressinfo/qknxgroupaddressinfo.pro
index b3a1681..3ab61ff 100644
--- a/tests/auto/qknxgroupaddressinfo/qknxgroupaddressinfo.pro
+++ b/tests/auto/qknxgroupaddressinfo/qknxgroupaddressinfo.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxgroupaddressinfo
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetipcrd/qknxnetipcrd.pro b/tests/auto/qknxnetipcrd/qknxnetipcrd.pro
index 9919284..31be195 100644
--- a/tests/auto/qknxnetipcrd/qknxnetipcrd.pro
+++ b/tests/auto/qknxnetipcrd/qknxnetipcrd.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetipcrd
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetipcri/qknxnetipcri.pro b/tests/auto/qknxnetipcri/qknxnetipcri.pro
index 8552726..69fdaab 100644
--- a/tests/auto/qknxnetipcri/qknxnetipcri.pro
+++ b/tests/auto/qknxnetipcri/qknxnetipcri.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetipcri
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetipextendeddevicedib/qknxnetipextendeddevicedib.pro b/tests/auto/qknxnetipextendeddevicedib/qknxnetipextendeddevicedib.pro
index 99aec74..8cac502 100644
--- a/tests/auto/qknxnetipextendeddevicedib/qknxnetipextendeddevicedib.pro
+++ b/tests/auto/qknxnetipextendeddevicedib/qknxnetipextendeddevicedib.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetipextendeddevicedib
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetipknxaddressesdib/qknxnetipknxaddressesdib.pro b/tests/auto/qknxnetipknxaddressesdib/qknxnetipknxaddressesdib.pro
index bd17237..fd52791 100644
--- a/tests/auto/qknxnetipknxaddressesdib/qknxnetipknxaddressesdib.pro
+++ b/tests/auto/qknxnetipknxaddressesdib/qknxnetipknxaddressesdib.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetipknxaddressesdib
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetipmanufacturerdib/qknxnetipmanufacturerdib.pro b/tests/auto/qknxnetipmanufacturerdib/qknxnetipmanufacturerdib.pro
index 5a2a555..cf23d7c 100644
--- a/tests/auto/qknxnetipmanufacturerdib/qknxnetipmanufacturerdib.pro
+++ b/tests/auto/qknxnetipmanufacturerdib/qknxnetipmanufacturerdib.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetipmanufacturerdib
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetipsecuredservicefamiliesdib/qknxnetipsecuredservicefamiliesdib.pro b/tests/auto/qknxnetipsecuredservicefamiliesdib/qknxnetipsecuredservicefamiliesdib.pro
index 924949b..c3a61b6 100644
--- a/tests/auto/qknxnetipsecuredservicefamiliesdib/qknxnetipsecuredservicefamiliesdib.pro
+++ b/tests/auto/qknxnetipsecuredservicefamiliesdib/qknxnetipsecuredservicefamiliesdib.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetipsecuredservicefamiliesdib
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetipservicefamiliesdib/qknxnetipservicefamiliesdib.pro b/tests/auto/qknxnetipservicefamiliesdib/qknxnetipservicefamiliesdib.pro
index efed5bf..d44e27f 100644
--- a/tests/auto/qknxnetipservicefamiliesdib/qknxnetipservicefamiliesdib.pro
+++ b/tests/auto/qknxnetipservicefamiliesdib/qknxnetipservicefamiliesdib.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetipservicefamiliesdib
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetipstructure/qknxnetipstructure.pro b/tests/auto/qknxnetipstructure/qknxnetipstructure.pro
index a20f542..f7241a3 100644
--- a/tests/auto/qknxnetipstructure/qknxnetipstructure.pro
+++ b/tests/auto/qknxnetipstructure/qknxnetipstructure.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetipstructure
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetiptunnelingfeature/qknxnetiptunnelingfeature.pro b/tests/auto/qknxnetiptunnelingfeature/qknxnetiptunnelingfeature.pro
index 8b4e718..aceb772 100644
--- a/tests/auto/qknxnetiptunnelingfeature/qknxnetiptunnelingfeature.pro
+++ b/tests/auto/qknxnetiptunnelingfeature/qknxnetiptunnelingfeature.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetiptunnelingfeature
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle
diff --git a/tests/auto/qknxnetiptunnelinginfodib/qknxnetiptunnelinginfodib.pro b/tests/auto/qknxnetiptunnelinginfodib/qknxnetiptunnelinginfodib.pro
index b95ae45..cd6bf88 100644
--- a/tests/auto/qknxnetiptunnelinginfodib/qknxnetiptunnelinginfodib.pro
+++ b/tests/auto/qknxnetiptunnelinginfodib/qknxnetiptunnelinginfodib.pro
@@ -1,6 +1,6 @@
 TARGET = tst_qknxnetiptunnelinginfodib
 
-QT = core testlib knx
+QT = core testlib knx network
 CONFIG += testcase c++11
 
 CONFIG -= app_bundle