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

ProcessProgress: Add setExpectedDuration() method

Browse Source 
This is not the same as process timeout, so make these two
settings orthogonal.

Change-Id: I3fc774c183282fe770feb49258d77d0ce3637b38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2024-01-21 10:19:46 +01:00
parent 04d7858250
commit 04b80f092a
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/vcsbase/vcscommand.cpp
View File

@@ -104,7 +104,6 @@ void VcsCommandPrivate::cleanup()
void VcsCommandPrivate::setupProcess(Process *process, const Job &job)
{
process->setTimeoutS(job.timeoutS);
if (!job.workingDirectory.isEmpty())
process->setWorkingDirectory(job.workingDirectory);
if (!(m_flags & RunFlags::SuppressCommandLogging))
@@ -125,6 +124,7 @@ void VcsCommandPrivate::setupProcess(Process *process, const Job &job)
ProcessProgress *progress = new ProcessProgress(process);
progress->setDisplayName(m_displayName);
progress->setExpectedDuration(std::chrono::seconds(qMin(1, job.timeoutS / 5)));
if (m_progressParser)
progress->setProgressParser(m_progressParser);
}
@@ -314,6 +314,7 @@ CommandResult VcsCommand::runBlockingHelper(const CommandLine &command, int time
return {};
d->setupProcess(&process, {command, timeoutS, d->m_defaultWorkingDirectory, {}});
process.setTimeoutS(timeoutS);
const EventLoopMode eventLoopMode = d->eventLoopMode();
process.setTimeOutMessageBoxEnabled(eventLoopMode == EventLoopMode::On);