diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 15:29:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 19:29:23 +0200 |
| commit | 851d666bccc05b2ec9c38dbffd8be72b5303a8d6 (patch) | |
| tree | 741c199554a19788e035ab3811c0341a26341abd /qmake/generators/makefile.h | |
| parent | 61162c6e878e80f69965135949a5595eaf8581c7 (diff) | |
fix -spec/-xspec argument re-assembly
the specs in Option are now only fixifiable absolute paths if an actual
path was passed on the command line - otherwise these are just names,
and we should pass them on verbatim.
Change-Id: I5b3535dadf2d6b2b3116331e6636f6e363a5361f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 33602dcf80..e0863fb7d8 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -192,6 +192,7 @@ protected: //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); virtual bool doDepends() const { return Option::mkfile::do_deps; } |