Tooltips: Make sure tooltip is escaped (for rich text) when appending html.

src/plugins/cppeditor/cpphoverhandler.cpp

@@ -116,10 +116,12 @@ void CppHoverHandler::decorateToolTip()
     if (help.isValid()) {
         const QString &contents = help.extractContent(false);
         if (!contents.isEmpty()) {
-            if (help.category() == TextEditor::HelpItem::ClassOrNamespace)
+            if (help.category() == TextEditor::HelpItem::ClassOrNamespace) {
+                setToolTip(Qt::escape(toolTip()));
                 appendToolTip(contents);
-            else
+            } else {
                 setToolTip(contents);
+            }
         }
         addF1ToToolTip();
     }

src/plugins/texteditor/basehoverhandler.cpp

@@ -152,8 +152,10 @@ void BaseHoverHandler::decorateToolTip()
 
     if (lastHelpItemIdentified().isValid()) {
         const QString &contents = lastHelpItemIdentified().extractContent(false);
-        if (!contents.isEmpty())
+        if (!contents.isEmpty()) {
+            setToolTip(Qt::escape(toolTip()));
             appendToolTip(contents);
+        }
         addF1ToToolTip();
     }
 }