2 files changed, 18 insertions, 13 deletions
diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
index fe66ed5c7d..e7705f7460 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
@@ -255,7 +255,13 @@ void ClangDiagnosticConfigsWidget::syncOtherWidgetsToComboBox()
             ? m_notAcceptedOptions.value(config.id())
             : config.clangOptions().join(QLatin1Char(' '));
     setDiagnosticOptions(options);
-    m_clangBaseChecks->diagnosticOptionsTextEdit->setReadOnly(config.isReadOnly());
+    m_clangBaseChecksWidget->setEnabled(!config.isReadOnly());
+
+    if (config.isReadOnly()) {
+        m_ui->infoIcon->setPixmap(Utils::Icons::INFO.pixmap());
+        m_ui->infoLabel->setText(tr("Copy this configuration to customize it."));
+        m_ui->infoLabel->setStyleSheet(QString());
+    }
 
     syncClangTidyWidgets(config);
     syncClazyWidgets(config);
@@ -326,14 +332,13 @@ void ClangDiagnosticConfigsWidget::setDiagnosticOptions(const QString &options)
 {
     if (options != m_clangBaseChecks->diagnosticOptionsTextEdit->document()->toPlainText()) {
         disconnectDiagnosticOptionsChanged();
-
         m_clangBaseChecks->diagnosticOptionsTextEdit->document()->setPlainText(options);
-        const QString errorMessage
-                = validateDiagnosticOptions(normalizeDiagnosticInputOptions(options));
-        updateValidityWidgets(errorMessage);
-
         connectDiagnosticOptionsChanged();
     }
+
+    const QString errorMessage
+            = validateDiagnosticOptions(normalizeDiagnosticInputOptions(options));
+    updateValidityWidgets(errorMessage);
 }
 
 void ClangDiagnosticConfigsWidget::updateValidityWidgets(const QString &errorMessage)
@@ -350,9 +355,9 @@ void ClangDiagnosticConfigsWidget::updateValidityWidgets(const QString &errorMes
         styleSheet = "color: red;";
     }
 
-    m_ui->validationResultIcon->setPixmap(icon->pixmap());
-    m_ui->validationResultLabel->setText(validationResult);
-    m_ui->validationResultLabel->setStyleSheet(styleSheet);
+    m_ui->infoIcon->setPixmap(icon->pixmap());
+    m_ui->infoLabel->setText(validationResult);
+    m_ui->infoLabel->setStyleSheet(styleSheet);
 }
 
 void ClangDiagnosticConfigsWidget::connectClangTidyItemChanged()
diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.ui b/src/plugins/cpptools/clangdiagnosticconfigswidget.ui
index fdb0d07262..5e064be723 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigswidget.ui
+++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.ui
@@ -47,16 +47,16 @@
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
-        <widget class="QLabel" name="validationResultIcon">
+        <widget class="QLabel" name="infoIcon">
          <property name="text">
-          <string>ValidationIcon</string>
+          <string>InfoIcon</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="validationResultLabel">
+        <widget class="QLabel" name="infoLabel">
          <property name="text">
-          <string>ValidationText</string>
+          <string>InfoText</string>
          </property>
         </widget>
        </item>