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

Gerrit: Do not run plink executable in accessor of OptionsWidget.

Browse Source 
Do not run the process every time the user presses 'Ok' or 'Apply'
in the settings page, do it only if the gerrit parameters actually
changed. Also check for empty binary.

Change-Id: I934616e5d9b20404278f1fd9fc751ff161030cd8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-05-25 09:19:15 +02:00
parent 557c73adfb
commit 7c7ccdc764
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,7 @@ void GerritOptionsPage::apply()
const GerritParameters newParameters = w->parameters(); const GerritParameters newParameters = w->parameters();
if (newParameters != *m_parameters) { if (newParameters != *m_parameters) {
*m_parameters = newParameters; *m_parameters = newParameters;
m_parameters->setPortFlagBySshType();
m_parameters->toSettings(Core::ICore::instance()->settings()); m_parameters->toSettings(Core::ICore::instance()->settings());
} }
} }
@@ -124,7 +125,6 @@ GerritParameters GerritOptionsWidget::parameters() const
result.port = m_portSpinBox->value(); result.port = m_portSpinBox->value();
result.additionalQueries = m_additionalQueriesLineEdit->text().trimmed(); result.additionalQueries = m_additionalQueriesLineEdit->text().trimmed();
result.https = m_httpsCheckBox->isChecked(); result.https = m_httpsCheckBox->isChecked();
result.setPortFlagBySshType();
return result; return result;
} }

9
src/plugins/git/gerrit/gerritparameters.cpp
View File

@@ -89,9 +89,12 @@ static inline QString detectSsh()
void GerritParameters::setPortFlagBySshType() void GerritParameters::setPortFlagBySshType()
{ {
const QString version = Utils::PathChooser::toolVersion(ssh, QStringList(QLatin1String("-V"))); bool isPlink = false;
portFlag = (version.contains(QLatin1String("plink"), Qt::CaseInsensitive)) ? if (!ssh.isEmpty()) {
QLatin1String("-P") : QLatin1String(defaultPortFlag); const QString version = Utils::PathChooser::toolVersion(ssh, QStringList(QLatin1String("-V")));
isPlink = version.contains(QLatin1String("plink"), Qt::CaseInsensitive);
}
portFlag = isPlink ? QLatin1String("-P") : QLatin1String(defaultPortFlag);
} }
GerritParameters::GerritParameters() GerritParameters::GerritParameters()