Merge remote-tracking branch 'origin/4.12'

Change-Id: Ic741fdedc168430e5be6cb1645d9329dbc7a6b08
This commit is contained in:
Eike Ziller
2020-03-23 09:35:54 +01:00
28 changed files with 360 additions and 186 deletions

View File

@@ -105,6 +105,7 @@ void DebuggerLanguageAspect::addToLayout(LayoutBuilder &builder)
m_value = m_checkBox->isChecked() ? EnabledLanguage : DisabledLanguage;
emit changed();
});
builder.addItem(QString());
builder.addItem(m_checkBox.data());
if (!m_infoLabelText.isEmpty()) {