diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 15:36:39 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:23 +0200 |
| commit | 4b637bf1f0c5efe05a5f0098540f2195bc9b8c20 (patch) | |
| tree | d9f0041426643bec6a1f57975d543da3d1979088 | |
| parent | caa22630510fb625f9c2ed18660cb56eb585137c (diff) | |
fix specdir()
get the actual spec path directly from the project - the specs in Option
are not necessarily resolved.
Change-Id: Ia2bf2199c5269aa5b5a9d4c38de36171f25d448b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | qmake/generators/makefile.cpp | 3 | ||||
| -rw-r--r-- | qmake/project.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index f187190ac7..ca22655171 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3073,8 +3073,7 @@ QString MakefileGenerator::specdir() { if (spec.isEmpty()) - spec = fileFixify(project->isHostBuild() - ? Option::mkfile::qmakespec : Option::mkfile::xqmakespec); + spec = fileFixify(project->specDir()); return spec; } diff --git a/qmake/project.h b/qmake/project.h index 0e1ab7d870..8314c39321 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -136,6 +136,7 @@ public: QString projectFile(); QString confFile() const { return conffile; } QString cacheFile() const { return cachefile; } + QString specDir() const { return real_spec; } inline QMakeProperty *properties() { return prop; } bool doProjectTest(QString str, QHash<QString, QStringList> &place); |