Merge branch 'update_ci'

Author: jgeudens

.github/workflows/ccpp.yml

@@ -4,38 +4,47 @@ name: Build
 on: push
 
 jobs:
-
   linux:
-    runs-on: ubuntu-20.04
-    container: docker://jgeudens/qt-linux:5.15.2_build_1
+    runs-on: ubuntu-latest
+
+    container:
+      image: docker://jgeudens/qt-linux:6.4.1_build_1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update Modules and Build
-        run: sh scripts/build_linux.sh
+        run: bash scripts/build_linux.sh
 
       - name: Deploy
-        run: sh scripts/deploy_linux.sh
+        run: bash scripts/deploy_linux.sh
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: modbussim-linux
-          path: release/bin/linux/ModbusSim*.AppImage
+          path: ModbusSim*.AppImage
 
   windows:
     runs-on: windows-2019
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install Qt installer
         run: pip3 install aqtinstall
 
+      # Cache go build cache, used to speedup go test
+      - name: Qt Build Cache
+        uses: actions/cache@v3
+        id: cache
+        with:
+          path: ${{ github.workspace }}\Qt
+          key: ${{ runner.os }}-qt-build-${{ hashFiles('scripts\setup_windows.bat') }}
+
       - name: Setup, build and deploy
         shell: cmd
-        run: scripts/full_build_and_deploy_windows.bat ${{ github.workspace }}
+        run: scripts\full_build_and_deploy_windows.bat '${{ steps.cache.outputs.cache-hit }}' ${{ github.workspace }}\Qt
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: modbussim-windows
           path: |

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

scripts/build_windows.bat

@@ -9,6 +9,14 @@ echo %PATH%
 g++ -v
 
 cmake -G "Ninja" ..
+IF ERRORLEVEL 1 GOTO errorHandling
+
 ninja
+IF ERRORLEVEL 1 GOTO errorHandling
 
 cd ..
+
+EXIT /B 0
+
+:errorHandling
+EXIT /B 1

scripts/deploy_linux.sh

@@ -18,4 +18,6 @@ chmod +x linuxdeploy*.AppImage
 export APPIMAGE_EXTRACT_AND_RUN=1 # Workaround because FUSE isn't available in Docker
 ./linuxdeploy-x86_64.AppImage --appdir AppDir -e modbussim -i ModbusSim.png -d ModbusSim.desktop --plugin qt --output appimage
 
-ls
+ls
+
+cp ModbusSim*.AppImage ../../..

scripts/full_build_and_deploy_windows.bat

@@ -1,5 +1,9 @@
 echo on
 
-call scripts\setup_windows.bat %1
+REM Usage (path is optional):
+REM Use cache: scripts\full_build_and_deploy_windows.bat 'true' [path]
+REM No cache: scripts\full_build_and_deploy_windows.bat '' [path]
+
+call scripts\setup_windows.bat %1 %2
 call scripts\build_windows.bat
-call scripts\deploy_windows.bat
+call scripts\deploy_windows.bat

scripts/setup_windows.bat

@@ -1,35 +1,53 @@
 echo on
 
-if "%~1"=="" (set "QT_INSTALL_DIR=D:\aqt_Qt\Qt") else (set "QT_INSTALL_DIR=%~1\Qt")
+echo Argument1: %~1
+echo Argument2: %~2
+
+if "%~1"=="'true'" (set "CACHE_HIT=1") else (set "CACHE_HIT=0")
+if "%~2"=="" (set "QT_INSTALL_DIR=D:\aqt_Qt\Qt") else (set "QT_INSTALL_DIR=%~2")
 echo QT_INSTALL_DIR: %QT_INSTALL_DIR%
+echo CACHE_HIT: %CACHE_HIT%
 
 REM Set configuration
-set QT=5.15.2
-set QT_MODULES=
+set QT=6.4.1
+set QT_MODULES=qtserialbus qtserialport
 set QT_HOST=windows
 set QT_TARGET=desktop
-set QT_ARCH=win64_mingw81
+set QT_ARCH=win64_mingw
+
+set QT_ARCH_PATH=mingw_64
+
+if %CACHE_HIT% EQU 1 (
+    echo "Cache hit!"
+    goto cache_hit
+)
 
-set QT_ARCH_PATH=mingw81_64
+echo "Cache miss: installing Qt"
 
 REM Install Qt
 aqt install-qt --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% %QT% %QT_ARCH%  -m %QT_MODULES%
 
 REM Install Tools
-aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_mingw qt.tools.win64_mingw810
+aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_mingw90 qt.tools.win64_mingw900
 aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_cmake
 aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_ninja
 aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_openssl_x64
 
+:cache_hit
+
+REM Debug info
+echo Debug info
+dir %QT_INSTALL_DIR%\Tools
+
 REM Set env variables with path
 set "PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\bin;%PATH%"
-set "PATH=%QT_INSTALL_DIR%\Tools\mingw810_64\bin;%PATH%"
+set "PATH=%QT_INSTALL_DIR%\Tools\mingw1120_64\bin;%PATH%"
 set "PATH=%QT_INSTALL_DIR%\Tools\CMake_64\bin;%PATH%"
 set "PATH=%QT_INSTALL_DIR%\Tools\Ninja;%PATH%"
 
 set "QT_PLUGIN_PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\plugins\"
 set "QML_IMPORT_PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\qml\"
 set "QML2_IMPORT_PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\qml\"
-set "CMAKE_PREFIX_PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\lib\cmake\Qt5"
+set "CMAKE_PREFIX_PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\lib\cmake\Qt6"
 
 set "OPENSSL_DIR=%QT_INSTALL_DIR%\Tools\OpenSSL\Win_x64\bin"

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());
         }