From 4b637bf1f0c5efe05a5f0098540f2195bc9b8c20 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 26 Jun 2012 15:36:39 +0200 Subject: 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 --- qmake/generators/makefile.cpp | 3 +-- qmake/project.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qmake') 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 &place); -- cgit v1.2.3