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

Meson: fix broken project tree on windows

Browse Source 
Change-Id: I88d0e5b6f1547d5fa6fe832d26bafee59e535a4b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alexis Jeandet
2020-06-24 09:44:55 +02:00
parent 1c8b9e3d48
commit 8a2cb794b9
3 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,14 +42,14 @@ void buildTargetTree(std::unique_ptr<MesonProjectNode> &root, const Target &targ
void addTargetNode(std::unique_ptr<MesonProjectNode> &root, const Target &target)
{
root->findNode([&target, path = Utils::FilePath::fromString(target.definedIn)](
root->findNode([&root, &target, path = Utils::FilePath::fromString(target.definedIn)](
ProjectExplorer::Node *node) {
if (node->filePath() == path.absolutePath()) {
auto asFolder = dynamic_cast<ProjectExplorer::FolderNode *>(node);
if (asFolder) {
auto targetNode = std::make_unique<MesonTargetNode>(path.absolutePath().pathAppended(
target.name),
Target::fullName(target));
auto targetNode = std::make_unique<MesonTargetNode>(
path.absolutePath().pathAppended(target.name),
Target::fullName(Utils::FilePath::fromString(root->path()), target));
targetNode->setDisplayName(target.name);
asFolder->addNode(std::move(targetNode));
}
@@ -84,7 +84,7 @@ std::unique_ptr<MesonProjectNode> ProjectTree::buildTree(const Utils::FilePath &
addTargetNode(root, target);
});
for (Utils::FilePath bsFile : bsFiles) {
if (!bsFile.startsWith("/"))
if (!bsFile.toFileInfo().isAbsolute())
bsFile = srcDir.pathAppended(bsFile.toString());
root->addNestedNode(
std::make_unique<ProjectExplorer::FileNode>(bsFile, ProjectExplorer::FileType::Project));