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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Change-Id: I02e54f45d233b89ddaee9c87da9b9af2a56374b8
This commit is contained in:
Eike Ziller
2017-07-21 10:08:05 +02:00
parent 13d3a7a5dc e65d4c6f65
commit 1feb5c604d
178 changed files with 3814 additions and 1241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/git/branchdialog.cpp
View File

@@ -101,6 +101,7 @@ BranchDialog::BranchDialog(QWidget *parent) :
connect(m_model, &QAbstractItemModel::modelReset, this, &BranchDialog::expandAndResize);
m_ui->branchView->selectionModel()->clear();
enableButtons();
}
BranchDialog::~BranchDialog()

2
src/plugins/git/gerrit/gerritremotechooser.cpp
View File

@@ -60,7 +60,7 @@ GerritRemoteChooser::GerritRemoteChooser(QWidget *parent) :
connect(m_remoteComboBox, &QComboBox::currentTextChanged,
this, &GerritRemoteChooser::handleRemoteChanged);
m_resetRemoteButton->setIcon(Utils::Icons::RESET_TOOLBAR.icon());
m_resetRemoteButton->setIcon(Utils::Icons::RESET.icon());
connect(m_resetRemoteButton, &QToolButton::clicked,
this, [this] { updateRemotes(true); });
}