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

Adapt to upstream changes

Browse Source 
Change-Id: Idbe054570ef3af558d1c9cb2a18a1824502fe265
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2022-07-13 01:10:07 +02:00
parent b893eaa2b2
commit d44056f9d8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/fossil/fossilplugin.cpp
View File

@@ -56,6 +56,7 @@
#include <utils/commandline.h> #include <utils/commandline.h>
#include <utils/parameteraction.h> #include <utils/parameteraction.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/shellcommand.h>
#include <vcsbase/basevcseditorfactory.h> #include <vcsbase/basevcseditorfactory.h>
#include <vcsbase/basevcssubmiteditorfactory.h> #include <vcsbase/basevcssubmiteditorfactory.h>
@@ -165,10 +166,10 @@ public:
void vcsAnnotate(const FilePath &file, int line) final; void vcsAnnotate(const FilePath &file, int line) final;
void vcsDescribe(const FilePath &source, const QString &id) final; void vcsDescribe(const FilePath &source, const QString &id) final;
Core::ShellCommand *createInitialCheckoutCommand(const QString &url, Utils::ShellCommand *createInitialCheckoutCommand(const QString &url,
const Utils::FilePath &baseDirectory, const Utils::FilePath &baseDirectory,
const QString &localName, const QString &localName,
const QStringList &extraArgs) final; const QStringList &extraArgs) final;
void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override; void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override;
bool submitEditorAboutToClose() override; bool submitEditorAboutToClose() override;
@@ -995,10 +996,10 @@ void FossilPluginPrivate::vcsAnnotate(const FilePath &filePath, int line)
void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id) { m_client.view(source.toString(), id); } void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id) { m_client.view(source.toString(), id); }
Core::ShellCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl, Utils::ShellCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl,
const FilePath &baseDirectory, const FilePath &baseDirectory,
const QString &localName, const QString &localName,
const QStringList &extraArgs) const QStringList &extraArgs)
{ {
QMap<QString, QString> options; QMap<QString, QString> options;
FossilJsExtension::parseArgOptions(extraArgs, options); FossilJsExtension::parseArgOptions(extraArgs, options);