1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

un-clash iterator names

Browse Source 
Change-Id: I96b995c7f6dec06f75a61e109c419c9204744d90
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-07-15 15:09:11 +02:00 committed by The Qt Project
parent 922df2c233
commit 94e42cb772
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qmake/generators/makefile.cpp
View File

@ -1987,10 +1987,10 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
if(!exists(file)) { if(!exists(file)) {
QString localFile; QString localFile;
QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths(); QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths();
for(QList<QMakeLocalFileName>::Iterator it = depdirs.begin(); for (QList<QMakeLocalFileName>::Iterator dit = depdirs.begin();
it != depdirs.end(); ++it) { dit != depdirs.end(); ++dit) {
if(exists((*it).real() + Option::dir_sep + file)) { if (exists((*dit).real() + Option::dir_sep + file)) {
localFile = (*it).local() + Option::dir_sep + file; localFile = (*dit).local() + Option::dir_sep + file;
break; break;
} }
} }
@ -2065,10 +2065,10 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
if(!exists(file)) { if(!exists(file)) {
QString localFile; QString localFile;
QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths(); QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths();
for(QList<QMakeLocalFileName>::Iterator it = depdirs.begin(); for (QList<QMakeLocalFileName>::Iterator dit = depdirs.begin();
it != depdirs.end(); ++it) { dit != depdirs.end(); ++dit) {
if(exists((*it).real() + Option::dir_sep + file)) { if (exists((*dit).real() + Option::dir_sep + file)) {
localFile = (*it).local() + Option::dir_sep + file; localFile = (*dit).local() + Option::dir_sep + file;
break; break;
} }
} }