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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: I5cacf96b5be4053d3a32a7c2a78fad463b9600d0
This commit is contained in:
Eike Ziller
2016-08-17 15:14:53 +02:00
parent 5f5d23c389 a7cbae1e4d
commit b43765b3e8
9 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -382,7 +382,10 @@ void BuildDirManager::extractData()
m_files.append(cbpparser.cmakeFileList());
foreach (const ProjectExplorer::FileNode *node, cbpparser.cmakeFileList())
m_cmakeFiles.insert(node->filePath());
} else {
}
// Make sure the top cmakelists.txt file is always listed:
if (!Utils::contains(m_files, [topCMake](ProjectExplorer::FileNode *fn) { return fn->filePath() == topCMake; })) {
m_files.append(new ProjectExplorer::FileNode(topCMake, ProjectExplorer::ProjectFileType, false));
}

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -193,7 +193,7 @@ FileName CMakeBuildConfiguration::shadowBuildDirectory(const FileName &projectFi
return FileName();
const QString projectName = projectFilePath.parentDir().fileName();
ProjectMacroExpander expander(projectName, k, bcName, buildType);
ProjectMacroExpander expander(projectFilePath.toString(), projectName, k, bcName, buildType);
QDir projectDir = QDir(Project::projectDirectory(projectFilePath).toString());
QString buildPath = expander.expand(Core::DocumentManager::buildDirectory());
return FileName::fromUserInput(projectDir.absoluteFilePath(buildPath));

1
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -105,6 +105,7 @@ CMakeProject::~CMakeProject()
{
setRootProjectNode(nullptr);
m_codeModelFuture.cancel();
qDeleteAll(m_watchedFiles);
qDeleteAll(m_extraCompilers);
}