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

Merge remote-tracking branch 'origin/4.2'

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

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
This commit is contained in:
Eike Ziller
2017-01-11 09:29:37 +01:00
parent fa84524c0c a8230eb6c1
commit b1f1ccb32e
39 changed files with 521 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -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);
}