Port to Qt6

Author: jgeudens

CMakeLists.txt

@@ -11,35 +11,36 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Tell CMake to run moc when necessary:
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(Qt5 COMPONENTS
-    Core
-    Gui
+# Find the QtCore library
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
+
+message(STATUS "Using Qt${QT_VERSION_MAJOR} version ${Qt${QT_VERSION_MAJOR}Core_VERSION}")
+
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS
     Widgets
     Xml
-    PrintSupport
     Network
     SerialBus
 
     REQUIRED
 )
 
 set(QT_LIB
-    Qt::Core
-    Qt::Gui
     Qt::Widgets
     Qt::Xml
-    Qt::PrintSupport
     Qt::Network
     Qt::SerialBus
 )
 
-include_directories(SYSTEM ${QT_INCLUDES})
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/testslave)
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/testslave
+)
 
 SET(APP_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp

src/mainwindow.cpp

@@ -36,7 +36,7 @@ MainWindow::MainWindow(QWidget *parent) :
     _exceptionGroup.addButton(_pUi->chkTargetNoResponse, QModbusPdu::GatewayTargetDeviceFailedToRespond);
     _exceptionGroup.addButton(_pUi->chkGatewayPathUnavailable, QModbusPdu::GatewayPathUnavailable);
 
-    connect(&_exceptionGroup, QOverload<int, bool>::of(&QButtonGroup::buttonToggled),
+    connect(&_exceptionGroup, QOverload<int, bool>::of(&QButtonGroup::idToggled), this,
         [=](int id, bool checked){
             if (checked)
             {
@@ -49,7 +49,7 @@ MainWindow::MainWindow(QWidget *parent) :
     _errorRecurrenceGroup.addButton(_pUi->optErrorOnce, true);
     _errorRecurrenceGroup.addButton(_pUi->optErrorPersistent, false);
 
-    connect(&_errorRecurrenceGroup, QOverload<int>::of(&QButtonGroup::buttonClicked),
+    connect(&_errorRecurrenceGroup, QOverload<int>::of(&QButtonGroup::idClicked), this,
         [=](int id){
         _bErrorOnce = static_cast<bool>(id);
         });
@@ -60,7 +60,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(&_autoIncTimer, &QTimer::timeout, this, &MainWindow::handleAutoIncTick);
     _autoIncTimer.start(1000);
     _bAutoInc = false;
-    connect(_pUi->checkAutoIncrement, &QCheckBox::stateChanged,
+    connect(_pUi->checkAutoIncrement, &QCheckBox::stateChanged, this,
         [=](int state){
             _bAutoInc = (state == Qt::Checked);
         });
@@ -151,6 +151,6 @@ void MainWindow::handleRequestProcessed()
 {
     if (_bErrorOnce)
     {
-        _pUi->chkNone->animateClick(Qt::Checked);
+        _pUi->chkNone->click();
     }
 }

src/registerdatamodel.cpp

@@ -49,6 +49,10 @@ QVariant RegisterDataModel::data(const QModelIndex &index, int role) const
         {
             return QString("%0").arg(registerAddress + 40001);
         }
+        else
+        {
+            return QVariant();
+        }
     }
     else if (role == Qt::CheckStateRole)
     {
@@ -101,7 +105,7 @@ bool RegisterDataModel::setData(const QModelIndex &index, const QVariant &value,
     }
     else if (role == Qt::EditRole)
     {
-        if (value.canConvert(QMetaType::UInt))
+        if (value.canConvert(QMetaType(QMetaType::UInt)))
         {
             _pTestSlaveData->setRegisterValue(registerAddress, value.toUInt());
         }