diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-05-14 12:36:37 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-20 12:30:34 (GMT) |
| commit | f5bc08b10143e888257ca64be09f9135b2328616 (patch) | |
| tree | 9f62850947c1a801573245549a29cf9ae8b352ed /tools | |
| parent | ab906fbeab7916b13196bd28569d5b8753d244aa (diff) | |
| download | Qt-f5bc08b10143e888257ca64be09f9135b2328616.zip Qt-f5bc08b10143e888257ca64be09f9135b2328616.tar.gz Qt-f5bc08b10143e888257ca64be09f9135b2328616.tar.bz2 | |
surround file inclusion with saving/restoring condition state
cherry-picked a86bdfdde40ca3bff03da590d98ee31f6d704751 from creator
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/shared/profileevaluator.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index c93a96e..f2e6433 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -1763,7 +1763,10 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction( // ### this breaks if we have include(c:/reallystupid.pri) but IMHO that's really bad style. QDir currentProPath(currentDirectory()); fileName = QDir::cleanPath(currentProPath.absoluteFilePath(fileName)); - return evaluateFile(fileName); + State sts = m_sts; + bool ok = evaluateFile(fileName); + m_sts = sts; + return ok; } case T_LOAD: { if (m_skipLevel && !m_cumulative) |