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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Conflicts:
	src/plugins/designer/cpp/formclasswizard.h
	src/plugins/designer/cpp/formclasswizarddialog.h

Change-Id: I9f9d166e1a9249022305503f9cbe571136c2a2b1
This commit is contained in:
Eike Ziller
2020-11-25 11:25:34 +01:00
parent 02c876f6e8 edef529df6
commit 8245523653
169 changed files with 1147 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangtools/clangtool.cpp
View File

@@ -825,7 +825,7 @@ void ClangTool::loadDiagnosticsFromFiles()
// Show imported
reset();
onNewDiagnosticsAvailable(diagnostics);
onNewDiagnosticsAvailable(diagnostics, /*generateMarks =*/ true);
setState(State::ImportFinished);
}
@@ -1129,10 +1129,10 @@ QSet<Diagnostic> ClangTool::diagnostics() const
});
}
void ClangTool::onNewDiagnosticsAvailable(const Diagnostics &diagnostics)
void ClangTool::onNewDiagnosticsAvailable(const Diagnostics &diagnostics, bool generateMarks)
{
QTC_ASSERT(m_diagnosticModel, return);
m_diagnosticModel->addDiagnostics(diagnostics);
m_diagnosticModel->addDiagnostics(diagnostics, generateMarks);
}
void ClangTool::updateForCurrentState()