diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-12-10 14:32:09 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-01-07 09:29:20 +0100 |
| commit | 18ac68adb3057882d0f664132d34d4337e86b05f (patch) | |
| tree | 7f9dc2e51537292a3fdb540ce3f9a878882adc7f /src/plugins/cpptools/cppcodemodelsettingspage.cpp | |
| parent | 5cf0fabb3b03729ff3f127e7b4e081b4b8ac8abf (diff) | |
| download | qt-creator-18ac68adb3057882d0f664132d34d4337e86b05f.tar.gz | |
C++: add header chooser to codemodel settings page.
Change-Id: I2da9c4b382afcad2faad1817af266381a2f02b2a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodemodelsettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodemodelsettingspage.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp index 3a5b41224c..ffacb11e5f 100644 --- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp +++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp @@ -60,6 +60,7 @@ void CppCodeModelSettingsWidget::setSettings(const QSharedPointer<CppCodeModelSe applyToWidget(m_ui->cppChooser, QLatin1String(Constants::CPP_SOURCE_MIMETYPE)); applyToWidget(m_ui->objcChooser, QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE)); applyToWidget(m_ui->objcppChooser, QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE)); + applyToWidget(m_ui->hChooser, QLatin1String(Constants::C_HEADER_MIMETYPE)); m_ui->ignorePCHCheckBox->setChecked(s->pchUsage() == CppCodeModelSettings::PchUse_None); } @@ -88,6 +89,8 @@ void CppCodeModelSettingsWidget::applyToSettings() const QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE)); changed |= applyToSettings(m_ui->objcppChooser, QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE)); + changed |= applyToSettings(m_ui->hChooser, + QLatin1String(Constants::C_HEADER_MIMETYPE)); if (m_ui->ignorePCHCheckBox->isChecked() != (m_settings->pchUsage() == CppCodeModelSettings::PchUse_None)) { @@ -104,11 +107,11 @@ void CppCodeModelSettingsWidget::applyToSettings() const bool CppCodeModelSettingsWidget::applyToSettings(QComboBox *chooser, const QString &mimeType) const { QString newId = chooser->itemData(chooser->currentIndex()).toString(); - QString ¤tId = m_settings->modelManagerSupportId(mimeType); + QString currentId = m_settings->modelManagerSupportId(mimeType); if (newId == currentId) return false; - currentId = newId; + m_settings->setModelManagerSupportId(mimeType, newId); return true; } |