Skip to content

Commit e0816c9

Browse files
committed
Modify code to build on Qt 6.9+
1 parent d40ce1e commit e0816c9

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/Vehicle/VehicleSetup/Bootloader.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,10 @@ bool Bootloader::_ihxVerifyBytes(const FirmwareImage* image)
651651

652652
for (int i=0; i<bytesToRead; i++) {
653653
if ((uint8_t)imageBytes[bytesIndex + i] != readBuf[i]) {
654-
_errorString = tr("Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3").arg(imageBytes[bytesIndex + i], 2, 16, QLatin1Char('0')).arg(readBuf[i], 2, 16, QLatin1Char('0')).arg(readAddress + i, 8, 16, QLatin1Char('0'));
654+
_errorString = tr("Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3")
655+
.arg(static_cast<qulonglong>(static_cast<quint8>(imageBytes[bytesIndex + i])), 2, 16, QLatin1Char('0'))
656+
.arg(static_cast<qulonglong>(static_cast<quint8>(readBuf[i])), 2, 16, QLatin1Char('0'))
657+
.arg(static_cast<qulonglong>(readAddress + i), 8, 16, QLatin1Char('0'));
655658
return false;
656659
}
657660
}

0 commit comments

Comments
 (0)