summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-11-14 21:12:56 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-04 16:32:51 +0000
commit7d04d8231957ff805405e50e06484aa6fc08bb4b (patch)
tree015538fe6affdf0517fe76c58b96ad7f50d2a8b6 /qmake/generators/makefile.h
parent5629187697fb2a66e7bbf2b5b2993c8bac94e3a4 (diff)
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>
Diffstat (limited to 'qmake/generators/makefile.h')
-rw-r--r--qmake/generators/makefile.h2
1 files changed, 1 insertions, 1 deletions
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;