diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-08-04 20:48:22 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-08-04 20:59:28 +0200 |
commit | b9721774448c1338c411aa8135a165529de94c93 (patch) | |
tree | ddcc9818dd966f981be8cd87395500ce3805ffce /src/shared/proparser | |
parent | 81f6001f911c8e899ee23269e324ed74bc3aba19 (diff) | |
download | qt-creator-b9721774448c1338c411aa8135a165529de94c93.tar.gz |
don't report prf inclusions to derived classes
Diffstat (limited to 'src/shared/proparser')
-rw-r--r-- | src/shared/proparser/profileevaluator.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 44f3b7157a..6584f503ad 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -2694,7 +2694,14 @@ bool ProFileEvaluator::Private::evaluateFeatureFile( } else { bool cumulative = m_cumulative; m_cumulative = false; - bool ok = evaluateFile(fn); + + // Don't use evaluateFile() here to avoid the virtual parsedProFile(). + // The path is fully normalized already. + ProFile pro(fn); + bool ok = false; + if (read(&pro)) + ok = (pro.Accept(this) == ProItem::ReturnTrue); + m_cumulative = cumulative; return ok; } |