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

Merge remote-tracking branch 'origin/4.5' into master

Browse Source 
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
This commit is contained in:
Orgad Shaneh
2017-10-17 20:00:44 +03:00
parent 5c554c0de9 aa4e05f07b
commit 371b2bbbab
128 changed files with 412 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,9 +99,9 @@ bool GerritRemoteChooser::setCurrentRemote(const QString &remoteName)
bool GerritRemoteChooser::updateRemotes(bool forceReload)
{
QTC_ASSERT(!m_repository.isEmpty() || !m_parameters, return false);
m_updatingRemotes = true;
m_remoteComboBox->clear();
m_remotes.clear();
m_updatingRemotes = true;
QString errorMessage; // Mute errors. We'll just fallback to the defaults
QMap<QString, QString> remotesList =
Git::Internal::GitPlugin::client()->synchronousRemotesList(m_repository, &errorMessage);