From 94e42cb7727cf0415c0f79d860228ad362aa4fb5 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 15 Jul 2013 15:09:11 +0200
Subject: un-clash iterator names

Change-Id: I96b995c7f6dec06f75a61e109c419c9204744d90
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 qmake/generators/makefile.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'qmake')

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;
                                     }
                                 }
-- 
cgit v1.2.3