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

rename fileVarGlue() => fixFileVarGlue()

Browse Source 
... 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>
This commit is contained in:
Oswald Buddenhagen 2014-11-14 21:12:56 +01:00
parent 5629187697
commit 7d04d82319
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/generators/makefile.cpp
View File

@ -1435,7 +1435,7 @@ MakefileGenerator::varGlue(const ProKey &var, const QString &before, const QStri
} }
QString 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; ProStringList varList;
foreach (const ProString &val, project->values(var)) foreach (const ProString &val, project->values(var))
@ -2561,12 +2561,12 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
t << varGlue("DISTCLEAN_DEPS"," "," ",""); t << varGlue("DISTCLEAN_DEPS"," "," ","");
t << " FORCE\n"; t << " FORCE\n";
if(suffix == "clean") { 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") { } else if(suffix == "distclean") {
QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName())); QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName()));
if(!ofile.isEmpty()) if(!ofile.isEmpty())
t << "\t-$(DEL_FILE) " << ofile << endl; t << "\t-$(DEL_FILE) " << ofile << endl;
t << fileVarGlue("QMAKE_DISTCLEAN", "\t-$(DEL_FILE) ", " ", "\n"); t << fixFileVarGlue("QMAKE_DISTCLEAN", "\t-$(DEL_FILE) ", " ", "\n");
} }
} }

2
qmake/generators/makefile.h
View File

@ -219,8 +219,8 @@ protected:
//for retrieving values and lists of values //for retrieving values and lists of values
virtual QString var(const ProKey &var) const; virtual QString var(const ProKey &var) const;
QString varGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) 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 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 ProStringList &varList) const;
QString val(const QStringList &varList) const; QString val(const QStringList &varList) const;
QString valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after) const; QString valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after) const;