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

CMake: Fix project name selection

Browse Source 
Change-Id: I03740045d817762ef91cf6399ac449c5af67b278
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-07 21:08:01 +01:00
parent a9947c24a9
commit bc598ec480
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -271,8 +271,11 @@ void ServerModeReader::generateProjectTree(CMakeListsNode *root,
} }
m_cmakeInputsFileNodes.clear(); // Clean out, they are not going to be used anymore! m_cmakeInputsFileNodes.clear(); // Clean out, they are not going to be used anymore!
if (!m_projects.isEmpty()) const Project *topLevel = Utils::findOrDefault(m_projects, [this](const Project *p) {
root->setDisplayName(m_projects.at(0)->name); return m_parameters.sourceDirectory == p->sourceDirectory;
});
if (topLevel)
root->setDisplayName(topLevel->name);
if (!cmakeFilesSource.isEmpty() || !cmakeFilesBuild.isEmpty() || !cmakeFilesOther.isEmpty()) if (!cmakeFilesSource.isEmpty() || !cmakeFilesBuild.isEmpty() || !cmakeFilesOther.isEmpty())
addCMakeInputs(root, m_parameters.sourceDirectory, m_parameters.buildDirectory, addCMakeInputs(root, m_parameters.sourceDirectory, m_parameters.buildDirectory,