From 0e29cca4cbd6250e082d3037628cf5463187a7b9 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 9 Dec 2009 14:43:13 +0100
Subject: [PATCH] Adding files for generic project get the right directory now.
For folder nodes.
Task-number: QTCREATORBUG-374
Reviewed-by: Thorbjorn
---
src/plugins/genericprojectmanager/genericprojectnodes.cpp | 5 ++++-
src/plugins/qmlprojectmanager/qmlprojectnodes.cpp | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
index b12f8cb5c28..8a7c69a841c 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
@@ -128,6 +128,8 @@ ProjectExplorer::FolderNode *GenericProjectNode::findOrCreateFolderByName(const
if (! end)
return 0;
+ QString baseDir = QFileInfo(path()).path();
+
QString folderName;
for (int i = 0; i < end; ++i) {
folderName.append(components.at(i));
@@ -142,7 +144,8 @@ ProjectExplorer::FolderNode *GenericProjectNode::findOrCreateFolderByName(const
else if (FolderNode *folder = m_folderByName.value(folderName))
return folder;
- FolderNode *folder = new FolderNode(component);
+ FolderNode *folder = new FolderNode(baseDir + "/" + folderName);
+ folder->setFolderName(component);
m_folderByName.insert(folderName, folder);
FolderNode *parent = findOrCreateFolderByName(components, end - 1);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
index da5318eb5bc..2c0ed621604 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
@@ -117,6 +117,8 @@ ProjectExplorer::FolderNode *QmlProjectNode::findOrCreateFolderByName(const QStr
if (! end)
return 0;
+ QString baseDir = QFileInfo(path()).path();
+
QString folderName;
for (int i = 0; i < end; ++i) {
folderName.append(components.at(i));
@@ -131,7 +133,9 @@ ProjectExplorer::FolderNode *QmlProjectNode::findOrCreateFolderByName(const QStr
else if (FolderNode *folder = m_folderByName.value(folderName))
return folder;
- FolderNode *folder = new FolderNode(component);
+ FolderNode *folder = new FolderNode(baseDir + "/" + folderName);
+ folder->setFolderName(component);
+
m_folderByName.insert(folderName, folder);
FolderNode *parent = findOrCreateFolderByName(components, end - 1);
--
GitLab