From 0ae75355dba20fbfbbdeee6f409e0506fa09170e Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Thu, 13 Mar 2014 13:11:47 +0100
Subject: [PATCH] ProjectTree; Fix directoryFor() to handle new resource nodes
The resource nodes do have a special path, the code assumed that
folder's path were always directories. This is no longer true.
Both pathFor() and directoryFor() suffer from path() being special for
VirtualFolderNodes and ResourceNodes. That specialness is probably not
a good idea, cleaning that up is a longer term task.
Task-number: QTCREATORBUG-11677
Change-Id: I995e82b7ed361b5e2c6681484074c65e2175c96e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/projectexplorer/projectexplorer.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 666c2cca7d9..1b9968a7747 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2771,6 +2771,12 @@ QString pathOrDirectoryFor(Node *node, bool dir)
list << f->path() + QLatin1Char('/');
location = Utils::commonPath(list);
}
+
+ QFileInfo fi(location);
+ while ((!fi.exists() || !fi.isDir())
+ && !fi.isRoot())
+ fi.setFile(fi.absolutePath());
+ location = fi.absoluteFilePath();
} else {
QFileInfo fi(path);
// remove any /suffixes, which e.g. ResourceNode uses
--
GitLab