diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-16 13:56:40 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-07-18 13:15:27 +0000 |
| commit | 7b4cde9d65ab7a2001e60efffd80329fe1cb21ac (patch) | |
| tree | 68226162f9a8c14ecef5c2cd50de1073d2777a50 /src/plugins/remotelinux | |
| parent | c8e656c506e22d62968ae2a5adf09c96f49efe12 (diff) | |
RemoteLinux: Add "make install" step to pre-4.10 deploy configurations
... if applicable.
Fixes: QTCREATORBUG-22689
Change-Id: If3cec90bed4d84f8bf82eb0cc1d831143ee2e298
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/remotelinux')
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index 88cd76f66d4..6bdef06dab9 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp @@ -61,11 +61,19 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory() "Deploy to Remote Linux Host")); setUseDeploymentDataView(); - addInitialStep(MakeInstallStep::stepId(), [](Target *target) { + const auto needsMakeInstall = [](Target *target) + { const Project * const prj = target->project(); return prj->deploymentKnowledge() == DeploymentKnowledge::Bad && prj->hasMakeInstallEquivalent(); + }; + setPostRestore([needsMakeInstall](DeployConfiguration *dc, const QVariantMap &map) { + // 4.9 -> 4.10. See QTCREATORBUG-22689. + if (map.value("_checkMakeInstall").toBool() && needsMakeInstall(dc->target())) + dc->stepList()->insertStep(0, new MakeInstallStep(dc->stepList())); }); + + addInitialStep(MakeInstallStep::stepId(), needsMakeInstall); addInitialStep(RemoteLinuxCheckForFreeDiskSpaceStep::stepId()); addInitialStep(RemoteLinuxKillAppStep::stepId()); addInitialStep(RsyncDeployStep::stepId(), [](Target *target) { |