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

clean up specdir()

Browse Source 
the only callers which used non-default arguments are gone now, so remove
the arguments entirely. this also enables us to re-enable result caching.

Change-Id: I62f76e17e531a4eeafddb9b29716ca0a0eb3dbea
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-06-26 15:32:17 +02:00 committed by Qt by Nokia
parent 851d666bcc
commit 003d294cd6
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qmake/generators/makefile.cpp
View File

@ -3072,14 +3072,11 @@ QStringList
} }
QString QString
MakefileGenerator::specdir(const QString &outdir, int host_build) MakefileGenerator::specdir()
{ {
#if 0 if (spec.isEmpty())
if(!spec.isEmpty()) spec = fileFixify(project->isHostBuild()
return spec; ? Option::mkfile::qmakespec : Option::mkfile::xqmakespec);
#endif
spec = fileFixify((host_build >= 0 ? bool(host_build) : project->isHostBuild())
? Option::mkfile::qmakespec : Option::mkfile::xqmakespec, outdir);
return spec; return spec;
} }

3
qmake/generators/makefile.h
View File

@ -189,9 +189,10 @@ protected:
bool mkdir(const QString &dir) const; bool mkdir(const QString &dir) const;
QString mkdir_p_asstring(const QString &dir, bool escape=true) const; QString mkdir_p_asstring(const QString &dir, bool escape=true) const;
QString specdir();
//subclasses can use these to query information about how the generator was "run" //subclasses can use these to query information about how the generator was "run"
QString buildArgs(const QString &outdir=QString()); QString buildArgs(const QString &outdir=QString());
QString specdir(const QString &outdir = QString(), int host_build = -1);
QString fixifySpecdir(const QString &spec, const QString &outdir); QString fixifySpecdir(const QString &spec, const QString &outdir);
virtual QStringList &findDependencies(const QString &file); virtual QStringList &findDependencies(const QString &file);