find .qmake.cache for subprojects independently

this allows the creation of aggregator projects, like, say, qt5.
this is not expected to have a negative impact, as no project could
reasonably expect a nested .qmake.cache to *not* take effect - in fact,
if the project was processed stand-alone, it would already use it.

Change-Id: I33f2935d309baba7e95465f2fefb8231c4f03eda
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 0946254594..92d6dd44f2 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -198,12 +198,12 @@ MakefileGenerator::initOutPaths()
     QHash<QString, QStringList> &v = project->variables();
     //for shadow builds
     if(!v.contains("QMAKE_ABSOLUTE_SOURCE_PATH")) {
-        if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty() &&
+        if (Option::mkfile::do_cache && !project->cacheFile().isEmpty() &&
            v.contains("QMAKE_ABSOLUTE_SOURCE_ROOT")) {
             QString root = v["QMAKE_ABSOLUTE_SOURCE_ROOT"].first();
             root = QDir::fromNativeSeparators(root);
             if(!root.isEmpty()) {
-                QFileInfo fi = fileInfo(Option::mkfile::cachefile);
+                QFileInfo fi = fileInfo(project->cacheFile());
                 if(!fi.makeAbsolute()) {
                     QString cache_r = fi.path(), pwd = Option::output_dir;
                     if(pwd.startsWith(cache_r) && !pwd.startsWith(root)) {
@@ -2692,7 +2692,7 @@ MakefileGenerator::writeMakeQmake(QTextStream &t)
         if(!ofile.isEmpty() && !project->isActiveConfig("no_autoqmake")) {
             t << escapeFilePath(ofile) << ": " << escapeDependencyPath(fileFixify(pfile)) << " ";
             if(Option::mkfile::do_cache)
-                t <<  escapeDependencyPath(fileFixify(Option::mkfile::cachefile)) << " ";
+                t <<  escapeDependencyPath(fileFixify(project->cacheFile())) << " ";
             if(!specdir().isEmpty()) {
                 if(exists(Option::fixPathToLocalOS(specdir()+QDir::separator()+"qmake.conf")))
                     t << escapeDependencyPath(specdir() + Option::dir_sep + "qmake.conf") << " ";