diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-23 13:30:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-23 13:30:20 +0200 |
| commit | f199d6f57db8a1b4ae31bbbf0ff959211ca5f6a5 (patch) | |
| tree | 678887ad1e35af08d0b961e129bd476262d9b2c8 | |
| parent | 21f9cfd09737c635b9a83181baa9c7bd47aa75ac (diff) | |
| parent | 6296335bf98d515ad97bc86027969873835cf075 (diff) | |
Merge remote-tracking branch 'origin/4.11'
Change-Id: I43583fd865da17133d04b939696618ab09e29da6
| -rw-r--r-- | plugins/fossil/fossilcontrol.cpp | 8 | ||||
| -rw-r--r-- | plugins/fossil/fossilplugin.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/fossil/fossilcontrol.cpp b/plugins/fossil/fossilcontrol.cpp index 20df682..a914078 100644 --- a/plugins/fossil/fossilcontrol.cpp +++ b/plugins/fossil/fossilcontrol.cpp @@ -265,7 +265,7 @@ Core::ShellCommand *FossilControl::createInitialCheckoutCommand(const QString &s << extraOptions << sourceUrl << fossilFileNative; - command->addJob(m_client->vcsBinary(), args, -1); + command->addJob({m_client->vcsBinary(), args}, -1); } // check out the cloned repository file into the working copy directory; @@ -274,20 +274,20 @@ Core::ShellCommand *FossilControl::createInitialCheckoutCommand(const QString &s QStringList args({"open", fossilFileNative}); if (!checkoutBranch.isEmpty()) args << checkoutBranch; - command->addJob(m_client->vcsBinary(), args, -1); + command->addJob({m_client->vcsBinary(), args}, -1); // set user default to admin user if specified if (!isLocalRepository && !adminUser.isEmpty()) { const QStringList args({ "user", "default", adminUser, "--user", adminUser}); - command->addJob(m_client->vcsBinary(), args, -1); + command->addJob({m_client->vcsBinary(), args}, -1); } // turn-off autosync if requested if (!isLocalRepository && disableAutosync) { const QStringList args({"settings", "autosync", "off"}); - command->addJob(m_client->vcsBinary(), args, -1); + command->addJob({m_client->vcsBinary(), args}, -1); } return command; diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index 8def0f7..e849caf 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -617,7 +617,7 @@ void FossilPlugin::createRepository() // Find current starting directory QString directory; if (const ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject()) - directory = currentProject->document()->filePath().toFileInfo().absolutePath(); + directory = currentProject->projectDirectory().toString(); // Prompt for a directory that is not under version control yet QWidget *mw = Core::ICore::mainWindow(); do { |