diff options
| -rw-r--r-- | qmake/generators/makefile.cpp | 11 | ||||
| -rw-r--r-- | qmake/generators/makefile.h | 3 |
2 files changed, 6 insertions, 8 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; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index e0863fb7d8..2cf774e2bc 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -189,9 +189,10 @@ protected: 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); |