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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
This commit is contained in:
Eike Ziller
2020-11-19 15:38:13 +01:00
parent b269066435 9b6944086b
commit 5ca70bdcb3
271 changed files with 2816 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/testtreemodel.cpp
View File

@@ -245,7 +245,7 @@ void TestTreeModel::synchronizeTestFrameworks()
qCDebug(LOG) << "Active frameworks sorted by priority" << sorted;
} else { // we've got custom project settings
const TestProjectSettings *settings = AutotestPlugin::projectSettings(project);
const QMap<ITestFramework *, bool> active = settings->activeFrameworks();
const QHash<ITestFramework *, bool> active = settings->activeFrameworks();
sorted = Utils::filtered(active.keys(), [active](ITestFramework *framework) {
return active.value(framework);
});