Merge remote-tracking branch 'origin/4.15'

Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

Change-Id: I722a94f37bdd1d78625cfae503ba6d02ff083c63
This commit is contained in:
Eike Ziller
2021-03-25 11:06:59 +01:00
143 changed files with 986 additions and 1081 deletions

View File

@@ -504,7 +504,7 @@ void SubmitEditorWidget::hideDescription()
setDescriptionMandatory(false);
}
void VcsBase::SubmitEditorWidget::verifyDescription()
void SubmitEditorWidget::verifyDescription()
{
auto fontColor = [](Utils::Theme::Color color) {
return QString("<font color=\"%1\">")