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

Meson: Filepathify some parsers

Browse Source 
Change-Id: I403a78e6a05a531b7ab8b5779fe9f87b0e01fc1d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-06-13 14:51:48 +02:00
parent 1fc0ca5277
commit 1bd2e84f9a
7 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/mesonprojectmanager/buildoptionsparser.h
View File

@@ -7,6 +7,8 @@
#include "common.h"
#include "mesonpluginconstants.h"
#include <utils/filepath.h>
#include <QFile>
#include <QJsonArray>
#include <QJsonDocument>
@@ -72,15 +74,14 @@ class BuildOptionsParser
std::vector<std::unique_ptr<BuildOption>> m_buildOptions;
public:
BuildOptionsParser(const QString &buildDir)
BuildOptionsParser(const Utils::FilePath &buildDir)
{
auto arr = load<QJsonArray>(QString("%1/%2/%3")
.arg(buildDir)
.arg(Constants::MESON_INFO_DIR)
.arg(Constants::MESON_INTRO_BUIDOPTIONS));
Utils::FilePath path = buildDir / Constants::MESON_INFO_DIR / Constants::MESON_INTRO_BUIDOPTIONS;
auto arr = load<QJsonArray>(path.toFSPathString());
if (arr)
m_buildOptions = load_options(*arr);
}
BuildOptionsParser(const QJsonDocument &js)
{
auto obj = get<QJsonArray>(js.object(), "buildoptions");