1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"cache" is used only locally, so move it into scope

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-01-09 20:20:00 +01:00 committed by Qt by Nokia
parent 259388157c
commit 365b5f7a92
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qmake/project.cpp
View File

@ -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;

2
qmake/project.h
View File

@ -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 {