diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 15:14:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-30 08:43:28 +0200 |
| commit | f06a9289787c01de323fe6e1ae71ceb2e5348a61 (patch) | |
| tree | b8b0c2e32780fe687c504bf8d08bfc694a85a97e /qmake/project.cpp | |
| parent | 179d9fe7b4cb089c3a6c0d0c9e653119af688d23 (diff) | |
| download | qtbase-f06a9289787c01de323fe6e1ae71ceb2e5348a61.tar.gz | |
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>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files 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(); |