diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 15:32:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 19:29:34 +0200 |
| commit | 003d294cd6cd0567a24cddb7e27ba5880fd2a599 (patch) | |
| tree | 9d06cde7bd1912634e3896cc25f1e46dfa54726d /qmake/generators/makefile.cpp | |
| parent | 851d666bccc05b2ec9c38dbffd8be72b5303a8d6 (diff) | |
clean up specdir()
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>
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 0e7bc99691..f126da3280 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3072,14 +3072,11 @@ QStringList } 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; } |