Boot2Qt: Use direct aspect registration in QdbMakeDefaultAppStep

Task-number: QTCREATORBUG-29168
Change-Id: I06c28f864cc9a517cfb8183ef2dfa366310438df
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 7 insertions, 11 deletions

diff --git a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
index ae5806deb9..b02beff530 100644
--- a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
+++ b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp
@@ -28,15 +28,11 @@ public:
     QdbMakeDefaultAppStep(BuildStepList *bsl, Id id)
         : AbstractRemoteLinuxDeployStep(bsl, id)
     {
-        auto selection = addAspect<SelectionAspect>();
-        selection->setSettingsKey("QdbMakeDefaultDeployStep.MakeDefault");
-        selection->addOption(Tr::tr("Set this application to start by default"));
-        selection->addOption(Tr::tr("Reset default application"));
+        selection.setSettingsKey("QdbMakeDefaultDeployStep.MakeDefault");
+        selection.addOption(Tr::tr("Set this application to start by default"));
+        selection.addOption(Tr::tr("Reset default application"));
 
-        setInternalInitializer([this, selection] {
-            m_makeDefault = selection->value() == 0;
-            return isDeploymentPossible();
-        });
+        setInternalInitializer([this] { return isDeploymentPossible(); });
     }
 
 private:
@@ -49,7 +45,7 @@ private:
                     remoteExe = exeAspect->executable().nativePath();
             }
             CommandLine cmd{deviceConfiguration()->filePath(Constants::AppcontrollerFilepath)};
-            if (m_makeDefault && !remoteExe.isEmpty())
+            if (selection() == 0 && !remoteExe.isEmpty())
                 cmd.addArgs({"--make-default", remoteExe});
             else
                 cmd.addArg("--remove-default");
@@ -60,7 +56,7 @@ private:
             });
         };
         const auto doneHandler = [this](const Process &) {
-            if (m_makeDefault)
+            if (selection() == 0)
                 addProgressMessage(Tr::tr("Application set as the default one."));
             else
                 addProgressMessage(Tr::tr("Reset the default application."));
@@ -71,7 +67,7 @@ private:
         return Group { ProcessTask(setupHandler, doneHandler, errorHandler) };
     }
 
-    bool m_makeDefault = true;
+    SelectionAspect selection{this};
 };
 
 // QdbMakeDefaultAppStepFactory