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

VCS: Use more FilePath in ShellCommand and surroundings

Browse Source 
Change-Id: Ie8c5fac09b45a54bcbe9a876044b653e7fccede5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2021-08-11 10:02:58 +02:00
parent 2aaa0a2180
commit bbde6ac9bf
21 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/vcsbase/wizard/vcscommandpage.cpp
View File

@@ -100,7 +100,7 @@ WizardPage *VcsCommandPageFactory::create(JsonWizard *wizard, Id typeId, const Q
foreach (const QVariant &value, tmp.value(QLatin1String(VCSCOMMAND_JOBS)).toList()) {
const QVariantMap job = value.toMap();
const bool skipEmpty = job.value(QLatin1String(JOB_SKIP_EMPTY), true).toBool();
const QString workDir = job.value(QLatin1String(JOB_WORK_DIRECTORY)).toString();
const FilePath workDir = FilePath::fromVariant(job.value(QLatin1String(JOB_WORK_DIRECTORY)));
const QString cmdString = job.value(QLatin1String(JOB_COMMAND)).toString();
QTC_ASSERT(!cmdString.isEmpty(), continue);
@@ -307,7 +307,7 @@ void VcsCommandPage::delayedInitialize()
args << tmp;
}
const QString dir = wiz->expander()->expand(job.workDirectory);
const FilePath dir = wiz->expander()->expand(job.workDirectory);
const int timeoutS = command->defaultTimeoutS() * job.timeOutFactor;
command->addJob({FilePath::fromUserInput(commandString), args}, timeoutS, dir);
}
@@ -324,10 +324,10 @@ void VcsCommandPage::setCheckoutData(const QString &repo, const QString &baseDir
m_arguments = args;
}
void VcsCommandPage::appendJob(bool skipEmpty, const QString &workDir, const QStringList &command,
void VcsCommandPage::appendJob(bool skipEmpty, const FilePath &workDir, const QStringList &command,
const QVariant &condition, int timeoutFactor)
{
m_additionalJobs.append(JobData(skipEmpty, workDir, command, condition, timeoutFactor));
m_additionalJobs.append(JobData{skipEmpty, workDir, command, condition, timeoutFactor});
}
void VcsCommandPage::setVersionControlId(const QString &id)