feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Use correct macroExpander when substituting regexp

Browse Source 
Change-Id: I1d17063044b0e0e52b055a3e53b214f311cf6008
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2021-10-14 09:02:03 +03:00
committed by Orgad Shaneh
parent 10a6497146
commit badc1f8551
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggerengine.cpp
View File

@@ -2827,7 +2827,7 @@ void CppDebuggerEngine::validateRunParameters(DebuggerRunParameters &rp)
globalRegExpSourceMap.reserve(sourcePathMap.size()); globalRegExpSourceMap.reserve(sourcePathMap.size());
for (auto it = sourcePathMap.begin(), end = sourcePathMap.end(); it != end; ++it) { for (auto it = sourcePathMap.begin(), end = sourcePathMap.end(); it != end; ++it) {
if (it.key().startsWith('(')) { if (it.key().startsWith('(')) {
const QString expanded = Utils::globalMacroExpander()->expand(it.value()); const QString expanded = rp.macroExpander->expand(it.value());
if (!expanded.isEmpty()) if (!expanded.isEmpty())
globalRegExpSourceMap.push_back( globalRegExpSourceMap.push_back(
qMakePair(QRegularExpression(it.key()), expanded)); qMakePair(QRegularExpression(it.key()), expanded));