Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Filetransfer Plugin Qt6 issue. #452

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Fix Filetransfer Plugin Qt6 issue. #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Alexander Wenzel <[email protected]>
## 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).
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build_config.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)
)

Expand Down
2 changes: 1 addition & 1 deletion plugin/filetransferplugin/filetransferplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion src/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}


Expand Down