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

Adapt to changes in 4.11

Browse Source 
Change-Id: Ie02d61ecdb1a636ca4d21b1e5b09bde530c1fdca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2019-10-23 10:57:35 +02:00
parent 21f9cfd097
commit 6296335bf9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/fossil/fossilcontrol.cpp
View File

@@ -265,7 +265,7 @@ Core::ShellCommand *FossilControl::createInitialCheckoutCommand(const QString &s
<< extraOptions << extraOptions
<< sourceUrl << sourceUrl
<< fossilFileNative; << 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; // 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}); QStringList args({"open", fossilFileNative});
if (!checkoutBranch.isEmpty()) if (!checkoutBranch.isEmpty())
args << checkoutBranch; args << checkoutBranch;
command->addJob(m_client->vcsBinary(), args, -1); command->addJob({m_client->vcsBinary(), args}, -1);
// set user default to admin user if specified // set user default to admin user if specified
if (!isLocalRepository if (!isLocalRepository
&& !adminUser.isEmpty()) { && !adminUser.isEmpty()) {
const QStringList args({ "user", "default", adminUser, "--user", adminUser}); 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 // turn-off autosync if requested
if (!isLocalRepository if (!isLocalRepository
&& disableAutosync) { && disableAutosync) {
const QStringList args({"settings", "autosync", "off"}); const QStringList args({"settings", "autosync", "off"});
command->addJob(m_client->vcsBinary(), args, -1); command->addJob({m_client->vcsBinary(), args}, -1);
} }
return command; return command;

2
plugins/fossil/fossilplugin.cpp
View File

@@ -617,7 +617,7 @@ void FossilPlugin::createRepository()
// Find current starting directory // Find current starting directory
QString directory; QString directory;
if (const ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject()) 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 // Prompt for a directory that is not under version control yet
QWidget *mw = Core::ICore::mainWindow(); QWidget *mw = Core::ICore::mainWindow();
do { do {