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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181
This commit is contained in:
Orgad Shaneh
2019-03-01 12:20:57 +02:00
parent 8983185405 aa14e396f0
commit cbfc6e522d
129 changed files with 1253 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,6 +291,7 @@ GitDiffEditorController::GitDiffEditorController(IDocument *document, const QStr
{
connect(&m_decorator, &DescriptionWidgetDecorator::branchListRequested,
this, &GitDiffEditorController::updateBranchList);
setDisplayName("Git Diff");
}
void GitDiffEditorController::updateBranchList()
@@ -514,7 +515,9 @@ public:
GitDiffEditorController(document, dir),
m_id(id),
m_state(Idle)
{ }
{
setDisplayName("Git Show");
}
void reload() override;
void processCommandOutput(const QString &output) override;