diff options
author | Christian Stenger <christian.stenger@qt.io> | 2018-10-18 10:04:15 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2018-10-18 08:22:00 +0000 |
commit | bee01b69a2abb1606c048a66462d65c35790900d (patch) | |
tree | 994ed3215c04907bbc49e54557fd6f04943f790d | |
parent | dcd0faf4c4270ae5fc5706a96e48acd3e0e863a6 (diff) |
RemoteLinux: Fix compile with gcc5.3 and MSVC2015
Amends f4a12d488c1.
Change-Id: If731f634f473a8a051e4e5de0351f6387a2d1898
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/plugins/remotelinux/genericdirectuploadservice.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index 8ea7dbac2a..5f9a8353c0 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -61,8 +61,11 @@ enum class JobType { struct Job { DeployableFile file; - JobType type = JobType::None; + JobType type; QDateTime result; + explicit Job(const DeployableFile &file = DeployableFile(), JobType type = JobType::None, + const QDateTime &result = QDateTime()) + : file(file), type(type), result(result) {} }; class GenericDirectUploadServicePrivate @@ -244,7 +247,7 @@ void GenericDirectUploadService::handleJobFinished(SftpJobId jobId, const QStrin .arg(job.file.remoteFilePath())); saveDeploymentTimeStamp(job.file, QDateTime()); } else { - d->runningJobs.insert(jobId, { job.file, JobType::PostQuery, QDateTime() }); + d->runningJobs.insert(jobId, Job(job.file, JobType::PostQuery)); } uploadNextFile(); } @@ -298,7 +301,7 @@ void GenericDirectUploadService::runPostQueryOnProcResult() .arg(d->runningProcFile.remoteFilePath())); saveDeploymentTimeStamp(d->runningProcFile, QDateTime()); } else { - d->runningJobs.insert(jobId, { d->runningProcFile, JobType::PostQuery, QDateTime() }); + d->runningJobs.insert(jobId, Job(d->runningProcFile, JobType::PostQuery)); } clearRunningProc(); uploadNextFile(); @@ -359,7 +362,7 @@ void GenericDirectUploadService::handleMkdirFinished(int exitStatus) handleDeploymentDone(); } } else { - d->runningJobs[job] = { d->runningProcFile, JobType::Upload, QDateTime() }; + d->runningJobs[job] = Job(d->runningProcFile, JobType::Upload); clearRunningProc(); d->uploadJobRunning = true; } @@ -488,7 +491,7 @@ void GenericDirectUploadService::queryFiles() continue; } - d->runningJobs.insert(jobId, { file, JobType::PreQuery, QDateTime() }); + d->runningJobs.insert(jobId, Job(file, JobType::PreQuery)); } uploadNextFile(); |