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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Conflicts:
	src/libs/languageserverprotocol/workspace.cpp
	src/libs/languageserverprotocol/workspace.h

Change-Id: I739ae6642b1e2a505e351903f19df2550ef01629
This commit is contained in:
Eike Ziller
2021-05-12 15:27:30 +02:00
parent edf6178896 0cef9a8554
commit 3823b0af5f
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotest/gtest/gtestvisitors.cpp
View File

@@ -94,8 +94,12 @@ bool GTestVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast)
testCaseName.clear();
}
} else {
const CPlusPlus::Argument *testSuiteNameArg = ast->symbol->argumentAt(0)->asArgument();
const CPlusPlus::Argument *testCaseNameArg = ast->symbol->argumentAt(1)->asArgument();
const CPlusPlus::Symbol *firstArg = ast->symbol->argumentAt(0);
const CPlusPlus::Symbol *secondArg = ast->symbol->argumentAt(1);
if (!firstArg || !secondArg)
return false;
const CPlusPlus::Argument *testSuiteNameArg = firstArg->asArgument();
const CPlusPlus::Argument *testCaseNameArg = secondArg->asArgument();
if (testSuiteNameArg && testCaseNameArg) {
testSuiteName = m_overview.prettyType(testSuiteNameArg->type());
testCaseName = m_overview.prettyType(testCaseNameArg->type());