From ebce521ef936df06ad66f02dbbe304542cb85059 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Tue, 13 Oct 2015 18:46:55 +0200
Subject: [PATCH] Clang: Polish tool tip text for diagnostic

* Set the category apart.
* Show only the disable option and only in debug mode.

Change-Id: If5f65f9bd04c8e37e376a9862035005f4456394a
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
---
 src/plugins/clangcodemodel/clangdiagnosticmanager.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp b/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp
index 5baaaceb5e1..6c46c05b76e 100644
--- a/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp
+++ b/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp
@@ -94,15 +94,16 @@ bool isHelpfulChildDiagnostic(const ClangBackEnd::DiagnosticContainer &parentDia
 QString diagnosticText(const ClangBackEnd::DiagnosticContainer &diagnostic)
 {
     QString text = diagnostic.category().toString()
-            + QStringLiteral(" ")
+            + QStringLiteral("\n\n")
             + diagnostic.text().toString();
-    if (!diagnostic.enableOption().isEmpty()) {
-        text += QStringLiteral(" (clang option: ")
-                + diagnostic.enableOption().toString()
-                + QStringLiteral(" disable with: ")
+
+#ifdef QT_DEBUG
+    if (!diagnostic.disableOption().isEmpty()) {
+        text += QStringLiteral(" (disable with ")
                 + diagnostic.disableOption().toString()
                 + QStringLiteral(")");
     }
+#endif
 
     for (auto &&childDiagnostic : diagnostic.children()) {
         if (isHelpfulChildDiagnostic(diagnostic, childDiagnostic))