feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Conflicts:
	doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc

Change-Id: I906330addb7de31e6ed88f88af3fd2adbbe53e1f
This commit is contained in:
Eike Ziller
2021-05-31 16:13:47 +02:00
parent 90e9de5d5d fbeaa774b5
commit 2485c31a48
45 changed files with 166 additions and 2110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/languageserverprotocol/completion.cpp
View File

@@ -45,8 +45,9 @@ Utils::optional<MarkupOrString> CompletionItem::documentation() const
Utils::optional<CompletionItem::InsertTextFormat> CompletionItem::insertTextFormat() const
{
Utils::optional<int> value = optionalValue<int>(insertTextFormatKey);
return value.has_value() ? Utils::nullopt
: Utils::make_optional(CompletionItem::InsertTextFormat(value.value()));
return value.has_value()
? Utils::make_optional(CompletionItem::InsertTextFormat(value.value()))
: Utils::nullopt;
}