diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-11 14:45:48 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-14 15:30:28 +0000 |
| commit | ab23dce95f2a7dc4f1849c54d96d84abeadf05b7 (patch) | |
| tree | 9770c6a894eb67089f12956552d3bec1ba319d83 /src | |
| parent | ad478db4e4f3f3230302d973d89158b3d5b387d2 (diff) | |
qmake: make discard_from() patch up QMAKE_INTERNAL_INCLUDED_FILES as well
when the file's effects are discarded, the mention of the file should be
as well.
Change-Id: I894b7e2b887dd34d18533b197bfa9d0d84d647e7
(cherry picked from qtbase/c05f0a83fdb4823604d76f61bb884e206887e704)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 17712874e7..393b946bbb 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -1375,6 +1375,10 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( ++fit; } pro->deref(); + ProStringList &iif = m_valuemapStack.first()[ProKey("QMAKE_INTERNAL_INCLUDED_FILES")]; + int idx = iif.indexOf(ProString(fn)); + if (idx >= 0) + iif.removeAt(idx); return ReturnTrue; } case T_INFILE: |