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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Change-Id: I967615c66a11bb4823a6b403ca59e63dd1971032
This commit is contained in:
Eike Ziller
2022-02-07 16:34:41 +01:00
parent 73ae5bb1f6 454682ea3f
commit 68fd73713b
171 changed files with 1933 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,7 +415,7 @@ ClangdTextMark::ClangdTextMark(const FilePath &filePath,
QVector<QAction *> actions;
QAction *action = new QAction();
action->setIcon(QIcon::fromTheme("edit-copy", Icons::COPY.icon()));
action->setToolTip(tr("Clang Code Model Marks", "Copy to Clipboard"));
action->setToolTip(tr("Copy to Clipboard", "Clang Code Model Marks"));
QObject::connect(action, &QAction::triggered, [diag = m_diagnostic]() {
const QString text = ClangDiagnosticWidget::createText({diag},
ClangDiagnosticWidget::InfoBar);

4
src/plugins/clangcodemodel/test/clangdtests.cpp
View File

@@ -654,6 +654,10 @@ void ClangdTestTooltips::test()
timer.stop();
QEXPECT_FAIL("TypeName_ResolveTemplateTypeAlias", "typedef already resolved in AST", Abort);
if (client()->versionNumber() >= QVersionNumber(14)) {
QEXPECT_FAIL("TypeNameIntroducedByUsingDeclarationQualified",
"https://github.com/clangd/clangd/issues/989", Abort);
}
QCOMPARE(int(helpItem.category()), expectedCategory);
QEXPECT_FAIL("TemplateClassQualified", "Additional look-up needed?", Abort);
QCOMPARE(helpItem.helpIds(), expectedIds);