Merge remote-tracking branch 'origin/3.6'

Conflicts: src/plugins/clangcodemodel/clangassistproposalmodel.cpp src/plugins/clangcodemodel/clangassistproposalmodel.h Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
2016-01-19 16:41:17 +01:00
parent aa37df645d f8d4e4954b
commit 98257617e9
14 changed files with 130 additions and 51 deletions
--- a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp
+++ b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp
@@ -43,6 +43,7 @@ ClangAssistProposalModel::ClangAssistProposalModel(
        ClangBackEnd::CompletionCorrection neededCorrection)
    : m_neededCorrection(neededCorrection)
 {
+    setDetailTextFormat(Qt::RichText);
 }

 bool ClangAssistProposalModel::isSortable(const QString &/*prefix*/) const