feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FilePath: Return optional bytearray for file contents

Browse Source 
For differentiating between "error" and "empty file".

Change-Id: I2c019ceac625e7be3180afa4d47ae3a24df91c1d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2022-09-09 13:48:08 +02:00
parent 28349c1b08
commit 2c51e4bc17
22 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/mcusupport/mcusupportsdk.cpp
View File

@@ -751,7 +751,8 @@ McuSdkRepository targetsAndPackages(const FilePath &qtForMCUSdkPath,
for (const FilePath &filePath : descriptionFiles) {
if (!filePath.isReadableFile())
continue;
const McuTargetDescription desc = parseDescriptionJson(filePath.fileContents());
const McuTargetDescription desc = parseDescriptionJson(
filePath.fileContents().value_or(QByteArray()));
bool ok = false;
const int compatVersion = desc.compatVersion.toInt(&ok);
if (!desc.compatVersion.isEmpty() && ok && compatVersion > MAX_COMPATIBILITY_VERSION) {