diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-07-16 09:43:30 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-07-16 09:43:30 +0200 |
| commit | 519a1a97b32ea145286ebcc71de9ec987ec4fa00 (patch) | |
| tree | 265fe755b8ad4ac9f41153bb4f2713e1c12b5de5 /src/plugins/git/settingspage.cpp | |
| parent | c8f155c0fc2fd64f01d50f6c085dd811cfdae17e (diff) | |
| parent | fc33e35554fb93dbd2ceabd4f8a60b90cc7fce0e (diff) | |
| download | qt-creator-519a1a97b32ea145286ebcc71de9ec987ec4fa00.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Diffstat (limited to 'src/plugins/git/settingspage.cpp')
| -rw-r--r-- | src/plugins/git/settingspage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index 2167bafa7f..9a55e7330c 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -54,7 +54,8 @@ GitSettings SettingsPageWidget::settings() const rc.adoptPath = m_ui.environmentGroupBox->isChecked() && !rc.path.isEmpty(); rc.logCount = m_ui.logCountSpinBox->value(); rc.timeout = m_ui.timeoutSpinBox->value(); - rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked(); + rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked(); + rc.omitAnnotationDate = m_ui.omitAnnotationDataCheckBox->isChecked(); return rc; } @@ -65,6 +66,7 @@ void SettingsPageWidget::setSettings(const GitSettings &s) m_ui.logCountSpinBox->setValue(s.logCount); m_ui.timeoutSpinBox->setValue(s.timeout); m_ui.promptToSubmitCheckBox->setChecked(s.promptToSubmit); + m_ui.omitAnnotationDataCheckBox->setChecked(s.omitAnnotationDate); } void SettingsPageWidget::setSystemPath() |