3 files changed, 9 insertions, 11 deletions
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 714404ec5b7..4449284ea64 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -184,7 +184,7 @@ GroupItem GenericDirectUploadStep::statTree(const TreeStorage<UploadStorage> &st
             QTC_ASSERT(file.isValid(), continue);
             statList.append(statTask(storagePtr, file, statEndHandler));
         }
-        tree.setupRoot({statList});
+        tree.setRecipe({statList});
     };
     return TaskTreeTask(setupHandler);
 }
@@ -261,7 +261,7 @@ GroupItem GenericDirectUploadStep::chmodTree(const TreeStorage<UploadStorage> &s
             QTC_ASSERT(file.isValid(), continue);
             chmodList.append(chmodTask(file));
         }
-        tree.setupRoot({chmodList});
+        tree.setRecipe({chmodList});
     };
     return TaskTreeTask(setupChmodHandler);
 }
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index cc44dddb3c4..61939f20954 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -40,7 +40,6 @@
 #include <QMutex>
 #include <QReadWriteLock>
 #include <QRegularExpression>
-#include <QScopeGuard>
 #include <QTemporaryDir>
 #include <QThread>
 #include <QTimer>
@@ -978,7 +977,6 @@ LinuxDevice::LinuxDevice()
     addDeviceAction({Tr::tr("Open Remote Shell"), [](const IDevice::Ptr &device, QWidget *) {
                          device->openTerminal(Environment(), FilePath());
                      }});
-    setQmlRunCommand(filePath("qml"));
 }
 
 void LinuxDevice::_setOsType(Utils::OsType osType)
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 42f0467c947..a93fccba41b 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -41,13 +41,13 @@ const char CustomCommandLineAspectId[] = "RemoteLinux.MakeInstall.CustomCommandL
 
 MakeInstallStep::MakeInstallStep(BuildStepList *parent, Id id) : MakeStep(parent, id)
 {
-    makeCommandAspect()->setVisible(false);
-    buildTargetsAspect()->setVisible(false);
-    userArgumentsAspect()->setVisible(false);
-    overrideMakeflagsAspect()->setVisible(false);
-    nonOverrideWarning()->setVisible(false);
-    jobCountAspect()->setVisible(false);
-    disabledForSubdirsAspect()->setVisible(false);
+    m_makeCommandAspect.setVisible(false);
+    m_buildTargetsAspect.setVisible(false);
+    m_userArgumentsAspect.setVisible(false);
+    m_overrideMakeflagsAspect.setVisible(false);
+    m_nonOverrideWarning.setVisible(false);
+    m_jobCountAspect.setVisible(false);
+    m_disabledForSubdirsAspect.setVisible(false);
 
     // FIXME: Hack, Part#1: If the build device is not local, start with a temp dir
     // inside the build dir. On Docker that's typically shared with the host.