diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-11 20:01:53 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-14 15:30:17 +0000 |
| commit | ad478db4e4f3f3230302d973d89158b3d5b387d2 (patch) | |
| tree | 2bd0b3427b6b9a3066d1ca99972d093b11d66884 /src | |
| parent | 9d9bef2e2f6c55b0a8eef1d88a3ad8915a9e9498 (diff) | |
qmake: let discard_from() discard function definitions as well
for completeness.
Change-Id: I3ffc14e041408c773e277442828170e3df04ec8d
(cherry picked from qtbase/965e861e61ec56c91216d483987d33fb5a508b85)
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 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 0efa6af0eb..17712874e7 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -1362,6 +1362,18 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( } ++vit; } + for (auto fit = m_functionDefs.testFunctions.begin(); fit != m_functionDefs.testFunctions.end(); ) { + if (fit->pro() == pro) + fit = m_functionDefs.testFunctions.erase(fit); + else + ++fit; + } + for (auto fit = m_functionDefs.replaceFunctions.begin(); fit != m_functionDefs.replaceFunctions.end(); ) { + if (fit->pro() == pro) + fit = m_functionDefs.replaceFunctions.erase(fit); + else + ++fit; + } pro->deref(); return ReturnTrue; } |