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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Change-Id: I0657cee6b87eea7b3178548bebed85d5ac824519
This commit is contained in:
Eike Ziller
2020-01-03 08:57:33 +01:00
parent 586c6dd92f 4a00f53c17
commit 92546d0983
11 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,7 +467,7 @@ void addCompileGroups(ProjectNode *targetRoot,
if (sourcePath.isChildOf(buildDirectory) && !inSourceBuild) {
buildFileNodes.emplace_back(std::move(node));
} else if (sourcePath.isChildOf(sourceDirectory)) {
sourceGroupNodes[si.sourceGroup]->addNode(std::move(node));
sourceGroupNodes[si.sourceGroup]->addNestedNode(std::move(node));
} else {
otherFileNodes.emplace_back(std::move(node));
}