fix bugs surrounding reading super cache when no local cache is present
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 27 Jun 2012 13:14:34 +0000 (15:14 +0200)
committerQt by Nokia <qt-info@nokia.com>
Sat, 30 Jun 2012 06:43:28 +0000 (08:43 +0200)
we would ignore the early read variables and fail to export the super
cache's path to the project.

Change-Id: I3c467802b4af22f73be05b25dbd8ccb6196d28a8
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
qmake/project.cpp

index 36bf6ad..650635e 100644 (file)
@@ -1377,11 +1377,11 @@ QMakeProject::read(uchar cmd)
                         break;
                     }
                     if (dir == superdir)
-                        goto no_cache;
+                        break;
                     QFileInfo qsdfi(sdir);
                     QFileInfo qdfi(dir);
                     if (qsdfi.isRoot() || qdfi.isRoot())
-                        goto no_cache;
+                        break;
                     sdir = qsdfi.path();
                     dir = qdfi.path();
                 }
@@ -1410,7 +1410,6 @@ QMakeProject::read(uchar cmd)
             if (!cachefile.isEmpty())
                 vars["_QMAKE_CACHE_"] << cachefile;
         }
-      no_cache:
 
         // Look for mkspecs/ in source and build. First to win determines the root.
         QString sdir = qmake_getpwd();