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>

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index f187190..ca22655 100644 (file)
--- 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 0e1ab7d..8314c39 100644 (file)
--- 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);