Merge remote-tracking branch 'origin/4.2'

 Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98

1 files changed, 13 insertions, 14 deletions

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 24babea35e..23b68c77ce 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -91,20 +91,6 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
     DocumentManager::addDocument(m_includesIDocument);
     DocumentManager::addDocument(m_configIDocument);
 
-    auto projectFilesNode = new FileNode(Utils::FileName::fromString(m_filesFileName),
-                                         FileType::Project,
-                                         /* generated = */ false);
-
-    auto projectIncludesNode = new FileNode(Utils::FileName::fromString(m_includesFileName),
-                                            FileType::Project,
-                                            /* generated = */ false);
-
-    auto projectConfigNode = new FileNode(Utils::FileName::fromString(m_configFileName),
-                                          FileType::Project,
-                                          /* generated = */ false);
-
-    rootProjectNode()->addFileNodes({ projectFilesNode, projectIncludesNode, projectConfigNode });
-
     projectManager()->registerProject(this);
 }
 
@@ -282,6 +268,19 @@ void GenericProject::refresh(RefreshOptions options)
                 fileType = FileType::Resource;
             return new FileNode(Utils::FileName::fromString(f), fileType, false);
         });
+
+        auto projectFilesNode = new FileNode(Utils::FileName::fromString(m_filesFileName),
+                                             FileType::Project,
+                                             /* generated = */ false);
+
+        auto projectIncludesNode = new FileNode(Utils::FileName::fromString(m_includesFileName),
+                                                FileType::Project,
+                                                /* generated = */ false);
+
+        auto projectConfigNode = new FileNode(Utils::FileName::fromString(m_configFileName),
+                                              FileType::Project,
+                                              /* generated = */ false);
+        fileNodes << projectFilesNode << projectIncludesNode << projectConfigNode;
         rootProjectNode()->buildTree(fileNodes);
     }