diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-05-13 23:36:15 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2019-05-14 08:28:21 +0000 |
| commit | a1c0d912b273d6c5e902d97f9fbebee1fd8cae0b (patch) | |
| tree | 3d8d4ec169739602833f044c2267fef7b1869b29 | |
| parent | 00821627645cb826ac14884a0b262e5b92ac9c18 (diff) | |
Adapt to master
Change-Id: Ie1b9f937fe2daaaa2a181d28aec8ba065aff9e3f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | plugins/fossil/fossilclient.cpp | 3 | ||||
| -rw-r--r-- | plugins/fossil/fossilplugin.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index 4b0eb6e..aea3fdd 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -641,8 +641,9 @@ bool FossilClient::synchronousCreateRepository(const QString &workingDirectory, // @TODO: handle spaces in the path // @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) - .appendPath(Utils::FileName::fromString(repoName, Constants::FOSSIL_FILE_SUFFIX).toString()); + .appendPath(fullRepoName.toString()); QStringList args(vcsCommandString(CreateRepositoryCommand)); if (!adminUser.isEmpty()) args << "--admin-user" << adminUser; diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index bdc16fb..9d795b8 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -145,7 +145,7 @@ bool FossilPlugin::initialize(const QStringList &arguments, QString *errorMessag m_commandLocator = new Core::CommandLocator("Fossil", "fossil", "fossil", this); ProjectExplorer::JsonWizardFactory::addWizardPath(Utils::FileName::fromString(Constants::WIZARD_PATH)); - Core::JsExpander::registerQObjectForJs("Fossil", new FossilJsExtension); + Core::JsExpander::registerGlobalObject<FossilJsExtension>("Fossil"); createMenu(context); |