From d10c720dfc9a17bc67048c5b2fe9fa0102cc7da9 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 25 Jul 2024 07:38:57 +0200 Subject: [PATCH] Meson: Get rid of unused mesonInfo field Change-Id: I29c482a81e7628bc877761dca8fc83b326120b06 Reviewed-by: hjk --- src/plugins/mesonprojectmanager/mesoninfoparser.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/mesonprojectmanager/mesoninfoparser.h b/src/plugins/mesonprojectmanager/mesoninfoparser.h index 0a0feecf614..d45f2f15f89 100644 --- a/src/plugins/mesonprojectmanager/mesoninfoparser.h +++ b/src/plugins/mesonprojectmanager/mesoninfoparser.h @@ -121,7 +121,6 @@ struct Result TargetsList targets; BuildOptionsList buildOptions; Utils::FilePaths buildSystemFiles; - std::optional mesonInfo; }; inline QVersionNumber versionNumber(const Utils::FilePath &buildDir) @@ -138,8 +137,7 @@ inline Result parse(const Utils::FilePath &buildDir) { return {TargetParser::targetList(buildDir), BuildOptionsParser{buildDir}.takeBuildOptions(), - BuildSystemFilesParser::files(buildDir), - versionNumber(buildDir)}; + BuildSystemFilesParser::files(buildDir)}; } inline Result parse(const QByteArray &data) @@ -147,8 +145,7 @@ inline Result parse(const QByteArray &data) auto json = QJsonDocument::fromJson(data); return {TargetParser::targetList(json), BuildOptionsParser{json}.takeBuildOptions(), - BuildSystemFilesParser::files(json), - std::nullopt}; + BuildSystemFilesParser::files(json)}; } inline Result parse(QIODevice *introFile)