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

Meson: List files from extra_files target field in project tree

Browse Source 
Fixes: QTCREATORBUG-24824
Change-Id: Id37bdaea08fb527398195ac16f99fe3c00d36566
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alexis Jeandet
2020-10-25 21:45:35 +01:00
parent 96f6bd53b9
commit 8b23b6efbe
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/mesonprojectmanager/mesoninfoparser/parsers/targetparser.h
View File

@@ -66,6 +66,7 @@ class TargetParser
targetObj["id"].toString(), targetObj["id"].toString(),
targetObj["defined_in"].toString(), targetObj["defined_in"].toString(),
targetObj["filename"].toVariant().toStringList(), targetObj["filename"].toVariant().toStringList(),
targetObj["extra_files"].toVariant().toStringList(),
targetObj["subproject"].toString(), targetObj["subproject"].toString(),
extract_sources(targetObj["target_sources"].toArray())}; extract_sources(targetObj["target_sources"].toArray())};
return t; return t;

3
src/plugins/mesonprojectmanager/mesoninfoparser/target.h
View File

@@ -75,6 +75,7 @@ struct Target
const QString id; const QString id;
const QString definedIn; const QString definedIn;
const QStringList fileName; const QStringList fileName;
const QStringList extraFiles;
const Utils::optional<QString> subproject; const Utils::optional<QString> subproject;
const SourceGroupList sources; const SourceGroupList sources;
@@ -114,6 +115,7 @@ struct Target
QString &&id, QString &&id,
QString &&definedIn, QString &&definedIn,
QStringList &&fileName, QStringList &&fileName,
QStringList &&extraFiles,
QString &&subproject, QString &&subproject,
SourceGroupList &&sources) SourceGroupList &&sources)
: type{toType(type)} : type{toType(type)}
@@ -121,6 +123,7 @@ struct Target
, id{std::move(id)} , id{std::move(id)}
, definedIn{QDir::cleanPath(definedIn)} , definedIn{QDir::cleanPath(definedIn)}
, fileName{cleanPath(std::move(fileName))} , fileName{cleanPath(std::move(fileName))}
, extraFiles{cleanPath(std::move(extraFiles))}
, subproject{subproject.isNull() ? Utils::nullopt , subproject{subproject.isNull() ? Utils::nullopt
: Utils::optional<QString>{std::move(subproject)}} : Utils::optional<QString>{std::move(subproject)}}
, sources{std::move(sources)} , sources{std::move(sources)}

5
src/plugins/mesonprojectmanager/project/projecttree/projecttree.cpp
View File

@@ -38,6 +38,11 @@ void buildTargetTree(std::unique_ptr<MesonProjectNode> &root, const Target &targ
ProjectExplorer::FileType::Source)); ProjectExplorer::FileType::Source));
} }
} }
for (const auto &extraFile : target.extraFiles) {
root->addNestedNode(
std::make_unique<ProjectExplorer::FileNode>(Utils::FilePath::fromString(extraFile),
ProjectExplorer::FileType::Unknown));
}
} }
void addTargetNode(std::unique_ptr<MesonProjectNode> &root, const Target &target) void addTargetNode(std::unique_ptr<MesonProjectNode> &root, const Target &target)