From badc1f855175d6b6d1916443b69f010c0b4a6fa6 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 14 Oct 2021 09:02:03 +0300 Subject: [PATCH] Debugger: Use correct macroExpander when substituting regexp Change-Id: I1d17063044b0e0e52b055a3e53b214f311cf6008 Reviewed-by: hjk --- src/plugins/debugger/debuggerengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 514f778f909..87d52ad74b1 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -2827,7 +2827,7 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp) globalRegExpSourceMap.reserve(sourcePathMap.size()); for (auto it = sourcePathMap.begin(), end = sourcePathMap.end(); it != end; ++it) { if (it.key().startsWith('(')) { - const QString expanded = Utils::globalMacroExpander()->expand(it.value()); + const QString expanded = rp.macroExpander->expand(it.value()); if (!expanded.isEmpty()) globalRegExpSourceMap.push_back( qMakePair(QRegularExpression(it.key()), expanded));