Merge remote-tracking branch 'origin/4.12'

Conflicts:
	src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp

Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6
This commit is contained in:
Eike Ziller
2020-03-16 08:30:33 +01:00
181 changed files with 1729 additions and 856 deletions

View File

@@ -47,7 +47,7 @@ ManualRunDialog::ManualRunDialog(const CppcheckOptions &options,
{
QTC_ASSERT(project, return );
setWindowTitle(tr("Cppcheck run configuration"));
setWindowTitle(tr("Cppcheck Run Configuration"));
auto view = new QTreeView;
view->setHeaderHidden(true);