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

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Change-Id: I04104ef638b28d99da11b9b7a22f31f8d0ddf460
This commit is contained in:
Eike Ziller
2023-10-24 13:05:55 +02:00
parent 03acf2810d 5e3d14e2e9
commit df80454d26
277 changed files with 2282 additions and 2346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangdfollowsymbol.cpp
View File

@@ -340,7 +340,7 @@ IAssistProposal *ClangdFollowSymbol::VirtualFunctionAssistProcessor::createPropo
items << createEntry({}, m_followSymbol->d->defLink);
if (!final) {
const auto infoItem = new VirtualFunctionProposalItem({}, false);
infoItem->setText(Tr::tr("collecting overrides ..."));
infoItem->setText(Tr::tr("collecting overrides..."));
infoItem->setOrder(-1);
items << infoItem;
}

4
src/plugins/clangcodemodel/clangtextmark.cpp
View File

@@ -105,8 +105,8 @@ void disableDiagnosticInCurrentProjectConfig(const ClangDiagnostic &diagnostic)
projectSettings.setDiagnosticConfigId(config.id());
// Notify the user about changed project specific settings
const QString text = Tr::tr("Changes applied to diagnostic configuration \"%1\"")
.arg(config.displayName());
const QString text
= Tr::tr("Changes applied to diagnostic configuration \"%1\".").arg(config.displayName());
FadingIndicator::showText(Core::ICore::mainWindow(),
text,
FadingIndicator::SmallText);