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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/vcsbase/vcscommand.cpp

Change-Id: I2d33113bfb2ea7134550cda1de4e2c21e6711778
This commit is contained in:
Eike Ziller
2022-10-18 16:51:36 +02:00
parent ac3a7991ff 471b036803
commit 3bdb1a3edf
286 changed files with 5071 additions and 4075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/git/gitclient.cpp
View File

@@ -278,7 +278,8 @@ public:
: GitBaseDiffEditorController(document, leftCommit, rightCommit)
{
setReloader([this, extraArgs] {
runCommand({addConfigurationArguments(baseArguments() << extraArgs)});
runCommand({addConfigurationArguments(baseArguments() << extraArgs)},
VcsBaseEditor::getCodec(workingDirectory(), {}));
});
}
};
@@ -413,7 +414,7 @@ public:
argLists << addConfigurationArguments(baseArguments() << "--" << unstagedFiles);
if (!argLists.isEmpty())
runCommand(argLists);
runCommand(argLists, VcsBaseEditor::getCodec(workingDirectory(), stagedFiles + unstagedFiles));
});
}
};
@@ -1353,9 +1354,10 @@ VcsBaseEditorWidget *GitClient::annotate(
editor->setWorkingDirectory(workingDir);
QStringList arguments = {"blame", "--root"};
arguments << argWidget->arguments() << "--" << file;
arguments << argWidget->arguments();
if (!revision.isEmpty())
arguments << revision;
arguments << "--" << file;
editor->setDefaultLineNumber(lineNumber);
vcsExec(workingDir, arguments, editor);
return editor;