From 7d04d8231957ff805405e50e06484aa6fc08bb4b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 14 Nov 2014 21:12:56 +0100
Subject: rename fileVarGlue() => fixFileVarGlue()

... because it also fixes the path, and we'll need the "plain" name later.

Change-Id: I86da8f53e44a68005c413c4b78b1b1682746e22e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 qmake/generators/makefile.cpp | 6 +++---
 qmake/generators/makefile.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 7c3271d8ea..d6b620111d 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1435,7 +1435,7 @@ MakefileGenerator::varGlue(const ProKey &var, const QString &before, const QStri
 }
 
 QString
-MakefileGenerator::fileVarGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const
+MakefileGenerator::fixFileVarGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const
 {
     ProStringList varList;
     foreach (const ProString &val, project->values(var))
@@ -2561,12 +2561,12 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
             t << varGlue("DISTCLEAN_DEPS"," "," ","");
         t << " FORCE\n";
         if(suffix == "clean") {
-            t << fileVarGlue("QMAKE_CLEAN", "\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "\n");
+            t << fixFileVarGlue("QMAKE_CLEAN", "\t-$(DEL_FILE) ", "\n\t-$(DEL_FILE) ", "\n");
         } else if(suffix == "distclean") {
             QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName()));
             if(!ofile.isEmpty())
                 t << "\t-$(DEL_FILE) " << ofile << endl;
-            t << fileVarGlue("QMAKE_DISTCLEAN", "\t-$(DEL_FILE) ", " ", "\n");
+            t << fixFileVarGlue("QMAKE_DISTCLEAN", "\t-$(DEL_FILE) ", " ", "\n");
         }
     }
 
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 081bc23124..f834dc1588 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -219,8 +219,8 @@ protected:
     //for retrieving values and lists of values
     virtual QString var(const ProKey &var) const;
     QString varGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const;
-    QString fileVarGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const;
     QString varList(const ProKey &var) const;
+    QString fixFileVarGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const;
     QString val(const ProStringList &varList) const;
     QString val(const QStringList &varList) const;
     QString valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after) const;
-- 
cgit v1.2.3