1 files changed, 19 insertions, 20 deletions
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
index cf1c2face6..585f28da59 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
@@ -44,9 +44,8 @@ public:
 
 using namespace Internal;
 
-UploadAndInstallTarPackageService::UploadAndInstallTarPackageService(QObject *parent)
-    : AbstractUploadAndInstallPackageService(parent),
-      d(new UploadAndInstallTarPackageServicePrivate)
+UploadAndInstallTarPackageService::UploadAndInstallTarPackageService()
+    : d(new UploadAndInstallTarPackageServicePrivate)
 {
 }
 
@@ -64,26 +63,26 @@ AbstractRemoteLinuxPackageInstaller *UploadAndInstallTarPackageService::packageI
 UploadAndInstallTarPackageStep::UploadAndInstallTarPackageStep(BuildStepList *bsl)
     : AbstractRemoteLinuxDeployStep(bsl, stepId())
 {
-    m_deployService = new UploadAndInstallTarPackageService(this);
+    auto service = createDeployService<UploadAndInstallTarPackageService>();
+
     setDefaultDisplayName(displayName());
     setWidgetExpandedByDefault(false);
-}
 
-CheckResult UploadAndInstallTarPackageStep::initInternal()
-{
-    const TarPackageCreationStep *pStep = nullptr;
-
-    for (BuildStep *step : deployConfiguration()->stepList()->steps()) {
-        if (step == this)
-            break;
-        if ((pStep = dynamic_cast<TarPackageCreationStep *>(step)))
-            break;
-    }
-    if (!pStep)
-        return CheckResult::failure(tr("No tarball creation step found."));
-
-    m_deployService->setPackageFilePath(pStep->packageFilePath());
-    return m_deployService->isDeploymentPossible();
+    setInternalInitializer([this, service] {
+        const TarPackageCreationStep *pStep = nullptr;
+
+        for (BuildStep *step : deployConfiguration()->stepList()->steps()) {
+            if (step == this)
+                break;
+            if ((pStep = dynamic_cast<TarPackageCreationStep *>(step)))
+                break;
+        }
+        if (!pStep)
+            return CheckResult::failure(tr("No tarball creation step found."));
+
+        service->setPackageFilePath(pStep->packageFilePath());
+        return service->isDeploymentPossible();
+    });
 }
 
 Core::Id UploadAndInstallTarPackageStep::stepId()