diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-09-08 14:13:50 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-09-09 02:56:36 +0200 |
| commit | f1c881c4e08af3949bfd438e9d9b5c29012ab9d8 (patch) | |
| tree | 12c5be960400c2bfaa678dc11a014ace1b29c4dc /src/shared/proparser | |
| parent | 087eca4566f70ab95819b4f1c584bbc714b786e5 (diff) | |
| download | qt-creator-f1c881c4e08af3949bfd438e9d9b5c29012ab9d8.tar.gz | |
cache_valuemap doesn't have to be a member any more
Diffstat (limited to 'src/shared/proparser')
| -rw-r--r-- | src/shared/proparser/profileevaluator.cpp | 5 | ||||
| -rw-r--r-- | src/shared/proparser/profileevaluator.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index c4718c0849..948ff00cf3 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -1139,10 +1139,11 @@ ProItem::ProItemReturn ProFileEvaluator::Private::visitBeginProFile(ProFile * pr } if (!qmake_cache.isEmpty()) { qmake_cache = QDir::cleanPath(qmake_cache); - if (evaluateFileInto(qmake_cache, &m_option->cache_valuemap, 0)) { + QHash<QString, QStringList> cache_valuemap; + if (evaluateFileInto(qmake_cache, &cache_valuemap, 0)) { m_option->cachefile = qmake_cache; if (m_option->qmakespec.isEmpty()) { - const QStringList &vals = m_option->cache_valuemap.value(QLatin1String("QMAKESPEC")); + const QStringList &vals = cache_valuemap.value(QLatin1String("QMAKESPEC")); if (!vals.isEmpty()) m_option->qmakespec = vals.first(); } diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index cba159c6b8..691dd78e02 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -88,8 +88,7 @@ public: friend class ProFileEvaluator; friend class ProFileEvaluator::Private; static QString field_sep; // Just a cache for quick construction - QHash<QString, QStringList> cache_valuemap; // Cached results of .qmake.cache - QHash<QString, QStringList> base_valuemap; // ~ and qmake.conf and default_pre.prf + QHash<QString, QStringList> base_valuemap; // Cached results of qmake.conf, .qmake.cache & default_pre.prf FunctionDefs base_functions; QStringList feature_roots; }; |