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

CMakePM: Fix compilation with Qt 5.6

Browse Source 
Change-Id: I9c1b924c29b6f1531322987ce77a577353aea300
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-10-31 22:00:16 +02:00
committed by Christian Stenger
parent 0e7fc0ef2e
commit b4e8dba26a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,7 @@ void ServerModeReader::generateProjectTree(CMakeProjectNode *root)
knownFiles.insert((*it)->filePath()); knownFiles.insert((*it)->filePath());
QList<FileNode *> fileGroupNodes = m_cmakeInputsFileNodes; QList<FileNode *> fileGroupNodes = m_cmakeInputsFileNodes;
for (const FileGroup *fg : qAsConst(m_fileGroups)) { foreach (const FileGroup *fg, m_fileGroups) {
for (const FileName &s : fg->sources) { for (const FileName &s : fg->sources) {
const int oldCount = knownFiles.count(); const int oldCount = knownFiles.count();
knownFiles.insert(s); knownFiles.insert(s);
@@ -234,7 +234,7 @@ QSet<Core::Id> ServerModeReader::updateCodeModel(CppTools::ProjectPartBuilder &p
{ {
QSet<Core::Id> languages; QSet<Core::Id> languages;
int counter = 0; int counter = 0;
for (const FileGroup *fg : qAsConst(m_fileGroups)) { foreach (const FileGroup *fg, m_fileGroups) {
++counter; ++counter;
const QString defineArg const QString defineArg
= transform(fg->defines, [](const QString &s) -> QString { return QString::fromLatin1("#define ") + s; }).join('\n'); = transform(fg->defines, [](const QString &s) -> QString { return QString::fromLatin1("#define ") + s; }).join('\n');