feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: Remove indirection in RemoteLinuxDeployConfigurationFactory

Browse Source 
Change-Id: Iec5fc2cc8e31c5a6e2181b62e9b00c46aca94d0b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-06-02 18:40:09 +02:00
parent 5dddc42f70
commit 13146fb0bd
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
View File

@@ -25,14 +25,9 @@
#include "remotelinuxdeployconfiguration.h" #include "remotelinuxdeployconfiguration.h"
#include "checkforfreediskspacestep.h"
#include "genericdirectuploadstep.h"
#include "makeinstallstep.h" #include "makeinstallstep.h"
#include "killappstep.h"
#include "remotelinux_constants.h" #include "remotelinux_constants.h"
#include "rsyncdeploystep.h"
#include <projectexplorer/abi.h>
#include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/idevice.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
@@ -67,14 +62,14 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory()
} }
}); });
addInitialStep(MakeInstallStep::stepId(), needsMakeInstall); addInitialStep(Constants::MakeInstallStepId, needsMakeInstall);
addInitialStep(CheckForFreeDiskSpaceStep::stepId()); addInitialStep(Constants::CheckForFreeDiskSpaceId);
addInitialStep(KillAppStep::stepId()); addInitialStep(Constants::KillAppStepId);
addInitialStep(RsyncDeployStep::stepId(), [](Target *target) { addInitialStep(Constants::RsyncDeployStepId, [](Target *target) {
auto device = DeviceKitAspect::device(target->kit()); auto device = DeviceKitAspect::device(target->kit());
return device && device->extraData(Constants::SupportsRSync).toBool(); return device && device->extraData(Constants::SupportsRSync).toBool();
}); });
addInitialStep(GenericDirectUploadStep::stepId(), [](Target *target) { addInitialStep(Constants::DirectUploadStepId, [](Target *target) {
auto device = DeviceKitAspect::device(target->kit()); auto device = DeviceKitAspect::device(target->kit());
return device && !device->extraData(Constants::SupportsRSync).toBool(); return device && !device->extraData(Constants::SupportsRSync).toBool();
}); });