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

Merge remote-tracking branch 'origin/4.10' into 4.11

Browse Source 
Conflicts:
	src/libs/utils/fancymainwindow.cpp
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: I7aaeeb4f96c95fefd4944c083c1ddf9a19cd81d6
This commit is contained in:
Eike Ziller
2019-10-28 11:43:06 +01:00
parent fea693d9f9 189ab38641
commit a546e3a9cc
8 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/autotest/boost/boosttesttreeitem.cpp
View File

@@ -238,6 +238,8 @@ QList<TestConfiguration *> BoostTestTreeItem::getSelectedTestConfigurations() co
QString tcName = item->name();
if (item->state().testFlag(BoostTestTreeItem::Templated))
tcName.append("<*");
else if (item->state().testFlag(BoostTestTreeItem::Parameterized))
tcName.append('*');
tcName = handleSpecialFunctionNames(tcName);
testCasesForProjectFile[item->proFile()].testCases.append(
item->prependWithParentsSuitePaths(tcName));
@@ -275,6 +277,8 @@ TestConfiguration *BoostTestTreeItem::testConfiguration() const
QString tcName = handleSpecialFunctionNames(boostItem->name());
if (boostItem->type() == TestSuite) // execute everything below a suite
tcName.append("/*");
else if (boostItem->state().testFlag(BoostTestTreeItem::Parameterized))
tcName.append('*');
else if (boostItem->state().testFlag(BoostTestTreeItem::Templated))
tcName.append("<*");
testCases.append(boostItem->prependWithParentsSuitePaths(tcName));
@@ -285,6 +289,8 @@ TestConfiguration *BoostTestTreeItem::testConfiguration() const
QString tcName = name();
if (state().testFlag(BoostTestTreeItem::Templated))
tcName.append("<*");
else if (state().testFlag(BoostTestTreeItem::Parameterized))
tcName.append('*');
testCases.append(prependWithParentsSuitePaths(handleSpecialFunctionNames(tcName)));
}