aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qnx
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-09-26 14:27:41 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-09-27 12:29:40 +0000
commitd5f3335c5e9f812c98d837f4065d2294dee91e2d (patch)
tree52029dea325f85c15617ba8f06413fcc599502c1 /src/plugins/qnx
parentd4c0f9e5103056cb9e7d6a4affbd6000b39e98e5 (diff)
RemoteLinux: Use the "install to local dir" step in derived plugins
That is, Boot2Qt and Qnx. Task-number: QTCREATORBUG-22822 Change-Id: Id48069c6ee2bc857a94be173b6c1de9bc69404a8 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qnx')
-rw-r--r--src/plugins/qnx/qnxplugin.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index a078056136..c9f124b31a 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -55,6 +55,7 @@
#include <projectexplorer/toolchain.h>
#include <remotelinux/genericdirectuploadstep.h>
+#include <remotelinux/makeinstallstep.h>
#include <remotelinux/remotelinuxcheckforfreediskspacestep.h>
#include <qtsupport/qtkitinformation.h>
@@ -90,6 +91,11 @@ public:
addSupportedTargetDeviceType(Constants::QNX_QNX_OS_TYPE);
setUseDeploymentDataView();
+ addInitialStep(RemoteLinux::MakeInstallStep::stepId(), [](Target *target) {
+ const Project * const prj = target->project();
+ return prj->deploymentKnowledge() == DeploymentKnowledge::Bad
+ && prj->hasMakeInstallEquivalent();
+ });
addInitialStep(DeviceCheckBuildStep::stepId());
addInitialStep(RemoteLinux::RemoteLinuxCheckForFreeDiskSpaceStep::stepId());
addInitialStep(RemoteLinux::GenericDirectUploadStep::stepId());
@@ -110,6 +116,7 @@ public:
QnxDeployConfigurationFactory deployConfigFactory;
GenericQnxDeployStepFactory<RemoteLinux::GenericDirectUploadStep> directUploadDeployFactory;
GenericQnxDeployStepFactory<RemoteLinux::RemoteLinuxCheckForFreeDiskSpaceStep> checkForFreeDiskSpaceDeployFactory;
+ GenericQnxDeployStepFactory<RemoteLinux::MakeInstallStep> makeInstallDeployFactory;
GenericQnxDeployStepFactory<DeviceCheckBuildStep> checkBuildDeployFactory;
QnxRunConfigurationFactory runConfigFactory;
QnxSettingsPage settingsPage;