diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-15 15:09:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-15 19:45:49 +0200 |
| commit | 94e42cb7727cf0415c0f79d860228ad362aa4fb5 (patch) | |
| tree | fcfe6b02a632b5a53f9d567bad5739a4d31dbc01 /qmake | |
| parent | 922df2c2339288299fe8d9d5c781397f18532ba3 (diff) | |
un-clash iterator names
Change-Id: I96b995c7f6dec06f75a61e109c419c9204744d90
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index a08c76416b..1f2ebcf50e 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1987,10 +1987,10 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) if(!exists(file)) { QString localFile; QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths(); - for(QList<QMakeLocalFileName>::Iterator it = depdirs.begin(); - it != depdirs.end(); ++it) { - if(exists((*it).real() + Option::dir_sep + file)) { - localFile = (*it).local() + Option::dir_sep + file; + for (QList<QMakeLocalFileName>::Iterator dit = depdirs.begin(); + dit != depdirs.end(); ++dit) { + if (exists((*dit).real() + Option::dir_sep + file)) { + localFile = (*dit).local() + Option::dir_sep + file; break; } } @@ -2065,10 +2065,10 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) if(!exists(file)) { QString localFile; QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths(); - for(QList<QMakeLocalFileName>::Iterator it = depdirs.begin(); - it != depdirs.end(); ++it) { - if(exists((*it).real() + Option::dir_sep + file)) { - localFile = (*it).local() + Option::dir_sep + file; + for (QList<QMakeLocalFileName>::Iterator dit = depdirs.begin(); + dit != depdirs.end(); ++dit) { + if (exists((*dit).real() + Option::dir_sep + file)) { + localFile = (*dit).local() + Option::dir_sep + file; break; } } |