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>
}
QString
-MakefileGenerator::specdir(const QString &outdir, int host_build)
+MakefileGenerator::specdir()
{
-#if 0
- if(!spec.isEmpty())
- return spec;
-#endif
- spec = fileFixify((host_build >= 0 ? bool(host_build) : project->isHostBuild())
- ? Option::mkfile::qmakespec : Option::mkfile::xqmakespec, outdir);
+ if (spec.isEmpty())
+ spec = fileFixify(project->isHostBuild()
+ ? Option::mkfile::qmakespec : Option::mkfile::xqmakespec);
return spec;
}
bool mkdir(const QString &dir) 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"
QString buildArgs(const QString &outdir=QString());
- QString specdir(const QString &outdir = QString(), int host_build = -1);
QString fixifySpecdir(const QString &spec, const QString &outdir);
virtual QStringList &findDependencies(const QString &file);