1 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp
index 4fb66be7f8..9706fa7e26 100644
--- a/src/plugins/autotest/projectsettingswidget.cpp
+++ b/src/plugins/autotest/projectsettingswidget.cpp
@@ -105,22 +105,22 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(ProjectExplorer::Project *p
             TestTreeModel::instance(), &TestTreeModel::synchronizeTestFrameworks);
 }
 
-void ProjectTestSettingsWidget::populateFrameworks(const QMap<Core::Id, bool> &frameworks)
+void ProjectTestSettingsWidget::populateFrameworks(const QMap<ITestFramework *, bool> &frameworks)
 {
-    TestFrameworkManager *frameworkManager = TestFrameworkManager::instance();
-    auto end = frameworks.cend();
-    for (auto it = frameworks.cbegin(); it != end; ++it) {
-        auto *item = new QTreeWidgetItem(m_activeFrameworks,
-                                         QStringList(frameworkManager->frameworkNameForId(it.key())));
+    TestFrameworks sortedFrameworks = frameworks.keys();
+    Utils::sort(sortedFrameworks, &ITestFramework::priority);
+
+    for (ITestFramework *framework : sortedFrameworks) {
+        auto item = new QTreeWidgetItem(m_activeFrameworks, QStringList(QLatin1String(framework->name())));
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
-        item->setCheckState(0, it.value() ? Qt::Checked : Qt::Unchecked);
-        item->setData(0, FrameworkIdRole, it.key().toSetting());
+        item->setCheckState(0, frameworks.value(framework) ? Qt::Checked : Qt::Unchecked);
+        item->setData(0, FrameworkIdRole, framework->id().toSetting());
     }
 }
 
 void ProjectTestSettingsWidget::onActiveFrameworkChanged(QTreeWidgetItem *item, int column)
 {
-    auto id = Core::Id::fromSetting(item->data(column, FrameworkIdRole));
+    auto id = Utils::Id::fromSetting(item->data(column, FrameworkIdRole));
     m_projectSettings->activateFramework(id, item->data(0, Qt::CheckStateRole) == Qt::Checked);
     m_syncFrameworksTimer.start(3000);
 }