diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-01-09 20:20:00 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-27 10:54:48 +0100 |
| commit | 365b5f7a9271e5fc503b10e6c17371d76643fc94 (patch) | |
| tree | 67720d98f91a0abb46da07b9a677203f34d92f22 | |
| parent | 259388157c3b9541dc24e2fcb08a404c29e9d19f (diff) | |
"cache" is used only locally, so move it into scope
Change-Id: I0ba45d5620a8e5a79fdc6a1854245a0bfcc489f0
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | qmake/project.cpp | 1 | ||||
| -rw-r--r-- | qmake/project.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 308aba00b4..851534668b 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1306,6 +1306,7 @@ QMakeProject::read(uchar cmd) cache_depth = Option::output_dir.mid(abs_cache.length()).count('/'); } if(!qmake_cache.isEmpty()) { + QHash<QString, QStringList> cache; if(read(qmake_cache, cache)) { Option::mkfile::cachefile_depth = cache_depth; Option::mkfile::cachefile = qmake_cache; diff --git a/qmake/project.h b/qmake/project.h index ac3b2aab7a..823fa9c9d6 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -84,7 +84,7 @@ class QMakeProject QString pfile, cfile; QMakeProperty *prop; void reset(); - QHash<QString, QStringList> vars, base_vars, cache; + QHash<QString, QStringList> vars, base_vars; bool parse(const QString &text, QHash<QString, QStringList> &place, int line_count=1); enum IncludeStatus { |