From f06a9289787c01de323fe6e1ae71ceb2e5348a61 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 27 Jun 2012 15:14:34 +0200
Subject: [PATCH] fix bugs surrounding reading super cache when no local cache
 is present

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 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 36bf6add96..650635e993 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -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();