From 214679d65ba4ebd2d2be0b177f5eeac7df6d32aa Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 26 Feb 2010 17:43:37 +0100 Subject: Git: Improve Timeouts. - Observe timeout setting when running synchronous commands. - Increase Default on Windows - Stop process with terminate first (signal). Task-number: QTCREATORBUG-777 --- src/plugins/git/settingspage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/git/settingspage.cpp') diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index 61abe4148e5..f9157d7de27 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -55,7 +55,7 @@ GitSettings SettingsPageWidget::settings() const rc.path = m_ui.pathLineEdit->text(); rc.adoptPath = m_ui.environmentGroupBox->isChecked() && !rc.path.isEmpty(); rc.logCount = m_ui.logCountSpinBox->value(); - rc.timeout = m_ui.timeoutSpinBox->value(); + rc.timeoutSeconds = m_ui.timeoutSpinBox->value(); rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked(); rc.omitAnnotationDate = m_ui.omitAnnotationDataCheckBox->isChecked(); rc.spaceIgnorantBlame = m_ui.spaceIgnorantBlameCheckBox->isChecked(); @@ -67,7 +67,7 @@ void SettingsPageWidget::setSettings(const GitSettings &s) m_ui.environmentGroupBox->setChecked(s.adoptPath); m_ui.pathLineEdit->setText(s.path); m_ui.logCountSpinBox->setValue(s.logCount); - m_ui.timeoutSpinBox->setValue(s.timeout); + m_ui.timeoutSpinBox->setValue(s.timeoutSeconds); m_ui.promptToSubmitCheckBox->setChecked(s.promptToSubmit); m_ui.omitAnnotationDataCheckBox->setChecked(s.omitAnnotationDate); m_ui.spaceIgnorantBlameCheckBox->setChecked(s.spaceIgnorantBlame); -- cgit v1.2.3