1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index f4a333b6fa..7d58dbf466 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -87,7 +87,7 @@ McuPackage::McuPackage(const QString &label, const QString &defaultPath,
 
 QString McuPackage::path() const
 {
-    return QFileInfo(m_fileChooser->path() + m_relativePathModifier).absoluteFilePath();
+    return QFileInfo(m_fileChooser->filePath().toString() + m_relativePathModifier).absoluteFilePath();
 }
 
 QString McuPackage::label() const
@@ -125,7 +125,7 @@ QWidget *McuPackage::widget()
 
     if (!m_downloadUrl.isEmpty()) {
         auto downLoadButton = new QToolButton;
-        downLoadButton->setIcon(Utils::Icons::DOWNLOAD.icon());
+        downLoadButton->setIcon(Utils::Icons::ONLINE.icon());
         downLoadButton->setToolTip(tr("Download from \"%1\"").arg(m_downloadUrl));
         QObject::connect(downLoadButton, &QToolButton::pressed, [this]{
             QDesktopServices::openUrl(m_downloadUrl);
@@ -199,7 +199,7 @@ void McuPackage::updateStatus()
     m_path = m_fileChooser->rawPath();
     const bool validPath = m_fileChooser->isValid();
     const Utils::FilePath detectionPath = Utils::FilePath::fromString(
-                m_fileChooser->path() + "/" + m_detectionPath);
+                m_fileChooser->filePath().toString() + "/" + m_detectionPath);
     const QString displayDetectionPath = Utils::FilePath::fromString(m_detectionPath).toUserOutput();
     const bool validPackage = m_detectionPath.isEmpty() || detectionPath.exists();
 
@@ -240,7 +240,7 @@ McuToolChainPackage::Type McuToolChainPackage::type() const
     return m_type;
 }
 
-static ProjectExplorer::ToolChain *desktopToolChain(Core::Id language)
+static ProjectExplorer::ToolChain *desktopToolChain(Utils::Id language)
 {
     using namespace ProjectExplorer;
 
@@ -256,7 +256,7 @@ static ProjectExplorer::ToolChain *desktopToolChain(Core::Id language)
     return toolChain;
 }
 
-static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path, Core::Id language)
+static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path, Utils::Id language)
 {
     using namespace ProjectExplorer;
 
@@ -282,7 +282,7 @@ static ProjectExplorer::ToolChain* armGccToolChain(const Utils::FilePath &path,
     return toolChain;
 }
 
-ProjectExplorer::ToolChain *McuToolChainPackage::toolChain(Core::Id language) const
+ProjectExplorer::ToolChain *McuToolChainPackage::toolChain(Utils::Id language) const
 {
     ProjectExplorer::ToolChain *tc = nullptr;
     if (m_type == TypeDesktop) {
@@ -512,7 +512,7 @@ static void setKitProperties(const QString &kitName, ProjectExplorer::Kit *k,
     k->makeSticky();
     if (mcuTarget->toolChainPackage()->type() == McuToolChainPackage::TypeDesktop)
         k->setDeviceTypeForIcon(DEVICE_TYPE);
-    QSet<Core::Id> irrelevant = {
+    QSet<Utils::Id> irrelevant = {
         SysRootKitAspect::id(),
         QtSupport::QtKitAspect::id()
     };