forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/3.6'
Conflicts: src/plugins/clangcodemodel/clangassistproposalmodel.cpp src/plugins/clangcodemodel/clangassistproposalmodel.h Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
This commit is contained in:
@@ -101,7 +101,8 @@ QList<AssistProposalItem *> toAssistProposalItems(const CodeCompletions &complet
|
||||
items.insert(name, item);
|
||||
item->setText(name);
|
||||
item->setOrder(ccr.priority());
|
||||
QString detail = CompletionChunksToTextConverter::convertToToolTip(ccr.chunks());
|
||||
QString detail
|
||||
= CompletionChunksToTextConverter::convertToToolTipWithHtml(ccr.chunks());
|
||||
|
||||
if (!ccr.briefComment().isEmpty())
|
||||
detail += QStringLiteral("\n\n") + ccr.briefComment().toString();
|
||||
|
Reference in New Issue
Block a user