diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-12 20:15:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:33 +0200 |
| commit | 689aa4da2dd7c01ee487dc346db8fe6191c2da4a (patch) | |
| tree | 18d444f2621cbf25a2fb2f6394409862a2025546 /qmake/project.cpp | |
| parent | b6b6e85f6b0f75898afc341a8792626ebb9b99ee (diff) | |
move cachefile_depth calculation out of project evaluator
it has no business there
Change-Id: I6d1a4b55b5acacc470cc109a6c69a907abbba312
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 928ecc9bce..8b151539fd 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1333,9 +1333,9 @@ QMakeProject::read(uchar cmd) if (base_vars.isEmpty()) { QString superdir; QString project_root; - QString project_build_root; QStringList qmakepath; QStringList qmakefeatures; + project_build_root.clear(); if (Option::mkfile::do_cache) { // parse the cache QHash<QString, QStringList> cache; QString rdir = Option::output_dir; @@ -1403,10 +1403,6 @@ QMakeProject::read(uchar cmd) qmakepath = cache.value(QLatin1String("QMAKEPATH")); qmakefeatures = cache.value(QLatin1String("QMAKEFEATURES")); - if (Option::output_dir.startsWith(project_build_root)) - Option::mkfile::cachefile_depth = - Option::output_dir.mid(project_build_root.length()).count('/'); - if (!superfile.isEmpty()) vars["_QMAKE_SUPER_CACHE_"] << superfile; if (!cachefile.isEmpty()) |