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

qmake: sprinkle some const

Browse Source 
Change-Id: I7f4ecc97650d8ed9c9720f3ff3af1b7eaa89c623
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tim Jenssen
2017-02-17 16:45:11 +01:00
parent f9eab73dad
commit f716aac52a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -1378,25 +1378,25 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input)
QHash<QString, QVector<ProFileEvaluator::SourceFile>> exactSourceFiles; QHash<QString, QVector<ProFileEvaluator::SourceFile>> exactSourceFiles;
QHash<QString, QVector<ProFileEvaluator::SourceFile>> cumulativeSourceFiles; QHash<QString, QVector<ProFileEvaluator::SourceFile>> cumulativeSourceFiles;
QStringList baseVPathsExact const QStringList baseVPathsExact
= baseVPaths(exactReader, input.projectDir, input.buildDirectory.toString()); = baseVPaths(exactReader, input.projectDir, input.buildDirectory.toString());
QStringList baseVPathsCumulative const QStringList baseVPathsCumulative
= baseVPaths(cumulativeReader, input.projectDir, input.buildDirectory.toString()); = baseVPaths(cumulativeReader, input.projectDir, input.buildDirectory.toString());
for (int i = 0; i < static_cast<int>(FileType::FileTypeSize); ++i) { for (int i = 0; i < static_cast<int>(FileType::FileTypeSize); ++i) {
FileType type = static_cast<FileType>(i); const FileType type = static_cast<FileType>(i);
QStringList qmakeVariables = varNames(type, exactReader); const QStringList qmakeVariables = varNames(type, exactReader);
foreach (const QString &qmakeVariable, qmakeVariables) { foreach (const QString &qmakeVariable, qmakeVariables) {
QHash<ProString, bool> handled; QHash<ProString, bool> handled;
if (result->state == QmakeEvalResult::EvalOk) { if (result->state == QmakeEvalResult::EvalOk) {
QStringList vPathsExact = fullVPaths( const QStringList vPathsExact = fullVPaths(
baseVPathsExact, exactReader, qmakeVariable, input.projectDir); baseVPathsExact, exactReader, qmakeVariable, input.projectDir);
auto sourceFiles = exactReader->absoluteFileValues( auto sourceFiles = exactReader->absoluteFileValues(
qmakeVariable, input.projectDir, vPathsExact, &handled); qmakeVariable, input.projectDir, vPathsExact, &handled);
exactSourceFiles[qmakeVariable] = sourceFiles; exactSourceFiles[qmakeVariable] = sourceFiles;
extractSources(proToResult, &result->includedFiles.result, sourceFiles, type); extractSources(proToResult, &result->includedFiles.result, sourceFiles, type);
} }
QStringList vPathsCumulative = fullVPaths( const QStringList vPathsCumulative = fullVPaths(
baseVPathsCumulative, cumulativeReader, qmakeVariable, input.projectDir); baseVPathsCumulative, cumulativeReader, qmakeVariable, input.projectDir);
auto sourceFiles = cumulativeReader->absoluteFileValues( auto sourceFiles = cumulativeReader->absoluteFileValues(
qmakeVariable, input.projectDir, vPathsCumulative, &handled); qmakeVariable, input.projectDir, vPathsCumulative, &handled);