From 721b0f7033b41e4867f6e68f04490cf0d6912475 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Thu, 2 Oct 2014 16:15:18 +0200
Subject: [PATCH] GenericProject: Ensure that special nodes are only added once
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTCREATORBUG-13106
Change-Id: I3db25390879489a898bb263405319deb80a53092
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 .../genericprojectmanager/genericproject.cpp  | 17 ++++++++++++++++
 .../genericprojectnodes.cpp                   | 20 -------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index ebedabf240c..d543d84030b 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -93,6 +93,23 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
 
     m_rootNode = new GenericProjectNode(this, m_creatorIDocument);
 
+    FileNode *projectFilesNode = new FileNode(m_filesFileName,
+                                              ProjectFileType,
+                                              /* generated = */ false);
+
+    FileNode *projectIncludesNode = new FileNode(m_includesFileName,
+                                                 ProjectFileType,
+                                                 /* generated = */ false);
+
+    FileNode *projectConfigNode = new FileNode(m_configFileName,
+                                               ProjectFileType,
+                                               /* generated = */ false);
+
+    m_rootNode->addFileNodes(QList<FileNode *>()
+                             << projectFilesNode
+                             << projectIncludesNode
+                             << projectConfigNode);
+
     m_manager->registerProject(this);
 }
 
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
index 74c51ec7dc7..bfa2e2877d9 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
@@ -86,26 +86,6 @@ void GenericProjectNode::refresh(QSet<QString> oldFileList)
     typedef QHash<QString, QStringList> FilesInPathHash;
     typedef FilesInPathHash::ConstIterator FilesInPathHashConstIt;
 
-    if (oldFileList.isEmpty()) {
-        // Only do this once
-        FileNode *projectFilesNode = new FileNode(m_project->filesFileName(),
-                                                  ProjectFileType,
-                                                  /* generated = */ false);
-
-        FileNode *projectIncludesNode = new FileNode(m_project->includesFileName(),
-                                                     ProjectFileType,
-                                                     /* generated = */ false);
-
-        FileNode *projectConfigNode = new FileNode(m_project->configFileName(),
-                                                   ProjectFileType,
-                                                   /* generated = */ false);
-
-        addFileNodes(QList<FileNode *>()
-                     << projectFilesNode
-                     << projectIncludesNode
-                     << projectConfigNode);
-    }
-
     // Do those separately
     oldFileList.remove(m_project->filesFileName());
     oldFileList.remove(m_project->includesFileName());