diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-09-30 13:36:01 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-10-01 13:02:45 +0200 |
| commit | 507452f0971105e772e2c4913720cdd136ed2ca9 (patch) | |
| tree | 230680e9d1a7c550770be5592121e71ab28aef61 /src/plugins/cpptools/cppcodemodelsettingspage.cpp | |
| parent | 6603d9ae5fca16b0797709e9ba47bd47fd67ec3f (diff) | |
| download | qt-creator-507452f0971105e772e2c4913720cdd136ed2ca9.tar.gz | |
CppTools: honor pre-compiled headers in the code-model.
Task-number: QTCREATORBUG-476
Change-Id: I82ed92acdcda551d2c6a9ca221832ac20117a08f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodemodelsettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodemodelsettingspage.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp index af18b70445..e5fd37824a 100644 --- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp +++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp @@ -43,6 +43,8 @@ CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(QWidget *parent) , m_ui(new Ui::CppCodeModelSettingsPage) { m_ui->setupUi(this); + + m_ui->theGroupBox->setVisible(false); } CppCodeModelSettingsWidget::~CppCodeModelSettingsWidget() @@ -58,6 +60,8 @@ 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)); + + m_ui->ignorePCHCheckBox->setChecked(s->pchUsage() == CppCodeModelSettings::PchUse_None); } void CppCodeModelSettingsWidget::applyToWidget(QComboBox *chooser, const QString &mimeType) const @@ -85,6 +89,14 @@ void CppCodeModelSettingsWidget::applyToSettings() const changed |= applyToSettings(m_ui->objcppChooser, QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE)); + if (m_ui->ignorePCHCheckBox->isChecked() != + (m_settings->pchUsage() == CppCodeModelSettings::PchUse_None)) { + m_settings->setPCHUsage( + m_ui->ignorePCHCheckBox->isChecked() ? CppCodeModelSettings::PchUse_None + : CppCodeModelSettings::PchUse_BuildSystem); + changed = true; + } + if (changed) m_settings->toSettings(Core::ICore::settings()); } @@ -97,7 +109,9 @@ QString CppCodeModelSettingsWidget::searchKeywords() const << ' ' << m_ui->cLabel->text() << ' ' << m_ui->cppLabel->text() << ' ' << m_ui->objcLabel->text() - << ' ' << m_ui->objcppLabel->text(); + << ' ' << m_ui->objcppLabel->text() + << ' ' << m_ui->anotherGroupBox->title() + << ' ' << m_ui->ignorePCHCheckBox->text(); foreach (const QString &mmsNames, m_settings->availableModelManagerSupportersByName().keys()) ts << ' ' << mmsNames; rc.remove(QLatin1Char('&')); |