diff --git a/INSTALL.md b/INSTALL.md index 6697572d..332d050b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -5,7 +5,7 @@ Alexander Wenzel ## Instructions for installing DLT Viewer (GUI) * Install Qt5 SDK and Qt6 SDK including Qt Creator and Microsoft Visual Studio Build Tools 2019 -* Tested with QT 5.15.2 (Windows), QT 5.6.1 (Windows), and Qt 5.12.8 (Ubuntu 20.04LTS Linux) +* Tested with QT 5.15.2 (Windows), QT 6.6.2 (Windows), and Qt 5.12.8 (Ubuntu 20.04LTS Linux) * Open project BuildDltViewer.pro in Qt Creator. * Ensure that build options point to correct QT and MSVC. * Build Release in Qt Creator or via CMake (see last). diff --git a/README.md b/README.md index d5c0639e..6e3241ea 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ See INSTALL.txt regarding doxygen API documentation generation. Developed with QT5 and Qt6 (http://qt-project.org/) Tested with Windows 11 + Qt 5.15.2 + Microsoft Visual Studio Build Tools 2019 -Tested with Windows 11 + Qt 5.6.1 + Microsoft Visual Studio Build Tools 2019 +Tested with Windows 11 + Qt 6.6.2 + Microsoft Visual Studio Build Tools 2019 Tested with Ubuntu Linux 18.04 + Qt 5.9.5 Tested with macOS Sierra + Qt 5.7.0 Dynamically linked open source software diff --git a/build_config.bat b/build_config.bat index aed65161..9124909b 100644 --- a/build_config.bat +++ b/build_config.bat @@ -6,7 +6,7 @@ echo *** Setting up environment *** REM Currently tested combinations by Qt installation REM 5.15.2 msvc2019 -REM 6.6.1 msvc2019 +REM 6.6.2 msvc2019 if "%QTNO%"=="" ( set QTNO=6 @@ -16,7 +16,7 @@ if "%QTVER%"=="" ( if "%QTNO%"=="5" ( set QTVER=5.15.2 ) else ( - set QTVER=6.6.1 + set QTVER=6.6.12 ) ) diff --git a/plugin/filetransferplugin/filetransferplugin.cpp b/plugin/filetransferplugin/filetransferplugin.cpp index c41fb9ef..15827eb8 100644 --- a/plugin/filetransferplugin/filetransferplugin.cpp +++ b/plugin/filetransferplugin/filetransferplugin.cpp @@ -339,7 +339,7 @@ void FiletransferPlugin::doFLST(QDltMsg *msg) file->setFileSerialNumber(argument.toString()); msg->getArgument(PROTOCOL_FLST_FILENAME,argument); - file->setFilename(argument.toString()); + file->setFilename(argument.toString().remove(QChar::Null)); msg->getArgument(PROTOCOL_FLST_FILEDATE,argument); file->setFileCreationDate(argument.toString()); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 50093598..cc9c68c9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -5562,7 +5562,7 @@ void MainWindow::on_action_menuHelp_Info_triggered() #else QString("Architecture: Little Endian\n\n")+ #endif - QString("(C) 2016,2022 BMW AG\n")); + QString("(C) 2016,2024 BMW AG\n")); }