AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bugs surrounding reading super cache when no local cache is present

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-06-27 15:14:34 +02:00 committed by Qt by Nokia
parent 179d9fe7b4
commit f06a928978
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/project.cpp
View 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();