2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
index 137e0612b4..39a3684ab3 100644
--- a/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
+++ b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp
@@ -52,7 +52,7 @@ AnalyzerRunConfigWidget::AnalyzerRunConfigWidget(ProjectExplorer::GlobalOrProjec
             QApplication::translate("ProjectExplorer::Internal::EditorSettingsPropertiesPage", "Custom")
             }));
     globalSettingLayout->addWidget(m_settingsCombo);
-    connect(m_settingsCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(m_settingsCombo, QOverload<int>::of(&QComboBox::activated),
             this, &AnalyzerRunConfigWidget::chooseSettings);
     m_restoreButton = new QPushButton(
                 QApplication::translate("ProjectExplorer::Internal::EditorSettingsPropertiesPage", "Restore Global"),
diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp
index 0702536262..30ce83eca2 100644
--- a/src/plugins/debugger/analyzer/startremotedialog.cpp
+++ b/src/plugins/debugger/analyzer/startremotedialog.cpp
@@ -28,7 +28,7 @@
 #include <coreplugin/icore.h>
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/runcontrol.h>
 #include <ssh/sshconnection.h>
 
 #include <QDialogButtonBox>
@@ -63,7 +63,7 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent)
 
     d->kitChooser = new KitChooser(this);
     d->kitChooser->setKitPredicate([](const Kit *kit) {
-        const IDevice::ConstPtr device = DeviceKitInformation::device(kit);
+        const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
         return kit->isValid() && device && !device->sshParameters().host().isEmpty();
     });
     d->executable = new QLineEdit(this);
@@ -132,7 +132,7 @@ Runnable StartRemoteDialog::runnable() const
 {
     Kit *kit = d->kitChooser->currentKit();
     Runnable r;
-    r.device = DeviceKitInformation::device(kit);
+    r.device = DeviceKitAspect::device(kit);
     r.executable = d->executable->text();
     r.commandLineArguments = d->arguments->text();
     r.workingDirectory = d->workingDirectory->text();