From 62fe8fcef09542f08fa276adf671ea1bb50b7cb8 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Mon, 18 Jul 2016 09:41:33 +0200
Subject: [PATCH] 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>
---
 src/plugins/cpptools/cppcodemodelsettingspage.cpp |  3 ++-
 src/plugins/cpptools/cppcodemodelsettingspage.ui  | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
index b86bdadb86f..8fb52b72ccb 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 974f0f6b6ef..23ee9e764ec 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>