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

Adapt to master

Browse Source 
Change-Id: Ie1b9f937fe2daaaa2a181d28aec8ba065aff9e3f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2019-05-13 23:36:15 +03:00
committed by Orgad Shaneh
parent 0082162764
commit a1c0d912b2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/fossil/fossilclient.cpp
View File

@@ -641,8 +641,9 @@ bool FossilClient::synchronousCreateRepository(const QString &workingDirectory,
// @TODO: handle spaces in the path // @TODO: handle spaces in the path
// @TODO: what about --template options? // @TODO: what about --template options?
const Utils::FileName fullRepoName = Utils::FileName::fromStringWithExtension(repoName, Constants::FOSSIL_FILE_SUFFIX);
const Utils::FileName repoFilePath = Utils::FileName::fromString(repoPath) const Utils::FileName repoFilePath = Utils::FileName::fromString(repoPath)
.appendPath(Utils::FileName::fromString(repoName, Constants::FOSSIL_FILE_SUFFIX).toString()); .appendPath(fullRepoName.toString());
QStringList args(vcsCommandString(CreateRepositoryCommand)); QStringList args(vcsCommandString(CreateRepositoryCommand));
if (!adminUser.isEmpty()) if (!adminUser.isEmpty())
args << "--admin-user" << adminUser; args << "--admin-user" << adminUser;

2
plugins/fossil/fossilplugin.cpp
View File

@@ -145,7 +145,7 @@ bool FossilPlugin::initialize(const QStringList &arguments, QString *errorMessag
m_commandLocator = new Core::CommandLocator("Fossil", "fossil", "fossil", this); m_commandLocator = new Core::CommandLocator("Fossil", "fossil", "fossil", this);
ProjectExplorer::JsonWizardFactory::addWizardPath(Utils::FileName::fromString(Constants::WIZARD_PATH)); ProjectExplorer::JsonWizardFactory::addWizardPath(Utils::FileName::fromString(Constants::WIZARD_PATH));
Core::JsExpander::registerQObjectForJs("Fossil", new FossilJsExtension); Core::JsExpander::registerGlobalObject<FossilJsExtension>("Fossil");
createMenu(context); createMenu(context);