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

Meson: Get rid of unused mesonInfo field

Browse Source 
Change-Id: I29c482a81e7628bc877761dca8fc83b326120b06
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-25 07:38:57 +02:00
parent 61b139dbfe
commit d10c720dfc
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/mesonprojectmanager/mesoninfoparser.h
View File

@@ -121,7 +121,6 @@ struct Result
TargetsList targets; TargetsList targets;
BuildOptionsList buildOptions; BuildOptionsList buildOptions;
Utils::FilePaths buildSystemFiles; Utils::FilePaths buildSystemFiles;
std::optional<QVersionNumber> mesonInfo;
}; };
inline QVersionNumber versionNumber(const Utils::FilePath &buildDir) inline QVersionNumber versionNumber(const Utils::FilePath &buildDir)
@@ -138,8 +137,7 @@ inline Result parse(const Utils::FilePath &buildDir)
{ {
return {TargetParser::targetList(buildDir), return {TargetParser::targetList(buildDir),
BuildOptionsParser{buildDir}.takeBuildOptions(), BuildOptionsParser{buildDir}.takeBuildOptions(),
BuildSystemFilesParser::files(buildDir), BuildSystemFilesParser::files(buildDir)};
versionNumber(buildDir)};
} }
inline Result parse(const QByteArray &data) inline Result parse(const QByteArray &data)
@@ -147,8 +145,7 @@ inline Result parse(const QByteArray &data)
auto json = QJsonDocument::fromJson(data); auto json = QJsonDocument::fromJson(data);
return {TargetParser::targetList(json), return {TargetParser::targetList(json),
BuildOptionsParser{json}.takeBuildOptions(), BuildOptionsParser{json}.takeBuildOptions(),
BuildSystemFilesParser::files(json), BuildSystemFilesParser::files(json)};
std::nullopt};
} }
inline Result parse(QIODevice *introFile) inline Result parse(QIODevice *introFile)