summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2016-07-18 09:41:33 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2016-07-19 07:26:16 +0000
commit62fe8fcef09542f08fa276adf671ea1bb50b7cb8 (patch)
treeeddd40d20261932be686e7be205579799dea6485 /src
parent14ccac60b9d6732b177b833d121d636cb5f0c510 (diff)
downloadqt-creator-62fe8fcef09542f08fa276adf671ea1bb50b7cb8.tar.gz
Clang: Clarify when clang code model is enabled
Change-Id: I07cf53641ea4f9ddb7ca7a67977b1ad7d43c5bad Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/cpptools/cppcodemodelsettingspage.cpp3
-rw-r--r--src/plugins/cpptools/cppcodemodelsettingspage.ui11
2 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
index b86bdadb86..8fb52b72cc 100644
--- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp
+++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
@@ -75,7 +75,8 @@ void CppCodeModelSettingsWidget::setupClangCodeModelWidgets()
{
const bool isClangActive = CppModelManager::instance()->isClangCodeModelActive();
- m_ui->activateClangCodeModelPluginHint->setVisible(!isClangActive);
+ m_ui->clangCodeModelIsDisabledHint->setVisible(!isClangActive);
+ m_ui->clangCodeModelIsEnabledHint->setVisible(isClangActive);
m_ui->clangSettingsGroupBox->setEnabled(isClangActive);
ClangDiagnosticConfigsModel diagnosticConfigsModel(m_settings->clangCustomDiagnosticConfigs());
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.ui b/src/plugins/cpptools/cppcodemodelsettingspage.ui
index 974f0f6b6e..23ee9e764e 100644
--- a/src/plugins/cpptools/cppcodemodelsettingspage.ui
+++ b/src/plugins/cpptools/cppcodemodelsettingspage.ui
@@ -15,9 +15,16 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QLabel" name="activateClangCodeModelPluginHint">
+ <widget class="QLabel" name="clangCodeModelIsEnabledHint">
<property name="text">
- <string>&lt;i&gt;Activate the Clang Code Model plugin to enable the options here.&lt;/i&gt;</string>
+ <string>&lt;i&gt;The Clang Code Model is enabled because the corresponding plugin is loaded.&lt;/i&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="clangCodeModelIsDisabledHint">
+ <property name="text">
+ <string>&lt;i&gt;The Clang Code Model is disabled because the corresponding plugin is not loaded.&lt;/i&gt;</string>
</property>
</widget>
</item>