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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I266a41de38789922363d1d88e73726cdca608920
This commit is contained in:
Eike Ziller
2017-03-22 10:26:01 +01:00
parent 4d3c297d02 26e76d3387
commit edee1e805c
67 changed files with 560 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,9 +313,9 @@ QStringList CMakeProject::files(FilesMode fileMode) const
if (ProjectNode *rpn = rootProjectNode()) {
rpn->forEachNode([&](const FileNode *fn) {
const bool isGenerated = fn->isGenerated();
if (fileMode == Project::SourceFiles && !isGenerated)
if ((fileMode & Project::SourceFiles) && !isGenerated)
result.append(fn->filePath().toString());
if (fileMode == Project::GeneratedFiles && isGenerated)
if ((fileMode & Project::GeneratedFiles) && isGenerated)
result.append(fn->filePath().toString());
});
}