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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: I2d78020f10aa66fdded63883030313e0c411ce02
This commit is contained in:
Orgad Shaneh
2017-10-15 00:23:08 +03:00
parent 5a7a8cbf74 b67bf73dc7
commit 7a04014f9f
33 changed files with 189 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

@@ -135,8 +135,10 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev
initRemoteBranches();
if (m_ui->remoteComboBox->isEmpty())
if (m_ui->remoteComboBox->isEmpty()) {
m_initErrorMessage = tr("Cannot find a Gerrit remote. Add one and try again.");
return;
}
m_ui->localBranchComboBox->init(workingDir);
connect(m_ui->localBranchComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
@@ -158,8 +160,6 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev
connect(m_ui->remoteComboBox, &GerritRemoteChooser::remoteChanged,
this, [this] { setRemoteBranches(); });
m_isValid = true;
}
GerritPushDialog::~GerritPushDialog()
@@ -209,9 +209,9 @@ void GerritPushDialog::setChangeRange()
tr("Number of commits between %1 and %2: %3").arg(branch, remote, range));
}
bool GerritPushDialog::isValid() const
QString GerritPushDialog::initErrorMessage() const
{
return m_isValid;
return m_initErrorMessage;
}
void GerritPushDialog::storeTopic()