From b95a4bbe84e5216d8dba9a0c077062fbb0efb30b Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 11 Jan 2019 11:27:19 +0100
Subject: [PATCH] MakefileGenerator: deduplicate code

Factor out a resolveDependency method.
We will enhance it in a subsequent commit.

Change-Id: I4eead8bd03066c2ccbc9d9276acbc9f6c3bc6b97
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 qmake/generators/makefile.cpp | 34 ++++++++++++++--------------------
 qmake/generators/makefile.h   |  1 +
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 99455e7cb5d..45684b52251 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1839,6 +1839,18 @@ static QStringList splitDeps(const QString &indeps, bool lineMode)
     return deps;
 }
 
+QString MakefileGenerator::resolveDependency(const QDir &outDir, const QString &file)
+{
+    const QList<QMakeLocalFileName> &depdirs = QMakeSourceFileInfo::dependencyPaths();
+    for (const auto &depdir : depdirs) {
+        const QString &local = depdir.local();
+        QString lf = outDir.absoluteFilePath(local + '/' + file);
+        if (exists(lf))
+            return lf;
+    }
+    return {};
+}
+
 void
 MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
 {
@@ -1991,16 +2003,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                                 } else if (exists(absFile)) {
                                     file = absFile;
                                 } else {
-                                    QString localFile;
-                                    QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths();
-                                    for (QList<QMakeLocalFileName>::Iterator dit = depdirs.begin();
-                                        dit != depdirs.end(); ++dit) {
-                                        QString lf = outDir.absoluteFilePath((*dit).local() + '/' + file);
-                                        if (exists(lf)) {
-                                            localFile = lf;
-                                            break;
-                                        }
-                                    }
+                                    QString localFile = resolveDependency(outDir, file);
                                     if (localFile.isEmpty()) {
                                         if (exists(file))
                                             warn_msg(WarnDeprecated, ".depend_command for extra compiler %s"
@@ -2088,16 +2091,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                             } else if (exists(absFile)) {
                                 file = absFile;
                             } else {
-                                QString localFile;
-                                QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths();
-                                for (QList<QMakeLocalFileName>::Iterator dit = depdirs.begin();
-                                    dit != depdirs.end(); ++dit) {
-                                    QString lf = outDir.absoluteFilePath((*dit).local() + '/' + file);
-                                    if (exists(lf)) {
-                                        localFile = lf;
-                                        break;
-                                    }
-                                }
+                                QString localFile = resolveDependency(outDir, file);
                                 if (localFile.isEmpty()) {
                                     if (exists(file))
                                         warn_msg(WarnDeprecated, ".depend_command for extra compiler %s"
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 0c30e74a1d2..3a75f6f473d 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -82,6 +82,7 @@ protected:
     void writeExportedVariables(QTextStream &t);
     void writeExtraVariables(QTextStream &t);
     void writeExtraTargets(QTextStream &t);
+    QString resolveDependency(const QDir &outDir, const QString &file);
     void writeExtraCompilerTargets(QTextStream &t);
     void writeExtraCompilerVariables(QTextStream &t);
     bool writeDummyMakefile(QTextStream &t);