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

CMake: Fix possible crash before the project is fully set up

Browse Source 
Change-Id: Iacbf49e296a72176ae828fa11286432212078694
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-16 15:25:13 +01:00
parent 2ff0d30829
commit 9f1a9078c2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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