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

ProjectExplorer: Handle root directory when creating folders

Browse Source 
Handle root directory properly (a empty filePath in the base node) when
creating folder nodes in the project tree.

Change-Id: Iad761b94ee210406ed5ab9ceb2d00ce25db90046
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-07 21:03:24 +01:00
parent f9e9357756
commit 39e2c013dd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -383,12 +383,17 @@ FolderNode *FolderNode::folderNode(const Utils::FileName &directory) const
FolderNode *FolderNode::recursiveFindOrCreateFolderNode(const QString &directory) FolderNode *FolderNode::recursiveFindOrCreateFolderNode(const QString &directory)
{ {
Utils::FileName path = filePath(); Utils::FileName path = filePath();
QString workPath;
if (path.isEmpty() || path.toFileInfo().isRoot()) {
workPath = directory;
} else {
QDir parentDir(path.toString()); QDir parentDir(path.toString());
QString relativePath = parentDir.relativeFilePath(directory); workPath = parentDir.relativeFilePath(directory);
if (relativePath == ".") if (workPath == ".")
relativePath.clear(); workPath.clear();
}
const QStringList parts = workPath.split('/', QString::SkipEmptyParts);
QStringList parts = relativePath.split('/', QString::SkipEmptyParts);
ProjectExplorer::FolderNode *parent = this; ProjectExplorer::FolderNode *parent = this;
foreach (const QString &part, parts) { foreach (const QString &part, parts) {
path.appendPath(part); path.appendPath(part);