diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-11 20:01:53 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-09-14 13:48:48 +0000 |
| commit | cd2300a0cc0d059cf240accf13ccc3bb804e40de (patch) | |
| tree | 83cdc87e88cdcb4f420353ef9c5bfcb4576f8b1d /src/linguist/shared/qmakebuiltins.cpp | |
| parent | 4f8762caf751f4853fd8b5ede92b65e2a00be363 (diff) | |
qmake: let discard_from() discard function definitions as well
for completeness.
Change-Id: I3ffc14e041408c773e277442828170e3df04ec8d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from qtbase/965e861e61ec56c91216d483987d33fb5a508b85)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/linguist/shared/qmakebuiltins.cpp')
| -rw-r--r-- | src/linguist/shared/qmakebuiltins.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp index 848213820..c447a8970 100644 --- a/src/linguist/shared/qmakebuiltins.cpp +++ b/src/linguist/shared/qmakebuiltins.cpp @@ -1368,6 +1368,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; } |