AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unobfuscate makefiles re $(CHK_DIR_EXISTS)

Browse Source 
no need to define an obscure variable for it. just inline it.
the assignments are left in for compatibility with hand-written commands.

Change-Id: I9bc3914e2c4116f3b8fe00a421ca0f036bb7e214
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-05-29 10:53:00 +02:00
parent 76f0ce06e2
commit a40469ce57
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/generators/makefile.cpp
View File

@ -93,7 +93,7 @@ bool MakefileGenerator::canExecute(const QStringList &cmdline, int *a) const
QString MakefileGenerator::mkdir_p_asstring(const QString &dir, bool escape) const
{
QString ret = "@$(CHK_DIR_EXISTS) ";
QString ret = "@" + chkdir + " ";
if(escape)
ret += escapeFilePath(dir);
else
@ -431,6 +431,9 @@ MakefileGenerator::init()
init_already = true;
QHash<QString, QStringList> &v = project->variables();
chkdir = v["QMAKE_CHK_DIR_EXISTS"].join(" ");
QStringList &quc = v["QMAKE_EXTRA_COMPILERS"];
//make sure the COMPILERS are in the correct input/output chain order

1
qmake/generators/makefile.h
View File

@ -81,6 +81,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo
QString spec;
bool init_opath_already, init_already, no_io;
QHash<QString, bool> init_compiler_already;
QString chkdir;
QString build_args(const QString &outdir=QString());
void checkMultipleDefinition(const QString &, const QString &);