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

Beautifier: Fix Qt4 compile.

Browse Source 
Change-Id: Ifbd01628b28abe6879d30d43f8bd1f389988086f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
David Schulz
2014-02-18 08:32:38 +01:00
parent 3d1f07c023
commit def888d13a
7 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/beautifier/configurationpanel.cpp
View File

@@ -63,7 +63,9 @@ void ConfigurationPanel::setSettings(AbstractSettings *settings)
void ConfigurationPanel::setCurrentConfiguration(const QString &text)
{
ui->configurations->setCurrentText(text);
int textIndex = ui->configurations->findText(text);
if (textIndex != -1)
ui->configurations->setCurrentIndex(textIndex);
}
QString ConfigurationPanel::currentConfiguration() const
@@ -113,7 +115,9 @@ void ConfigurationPanel::populateConfigurations(const QString &key)
const QString currentText = (!key.isEmpty()) ? key : ui->configurations->currentText();
ui->configurations->clear();
ui->configurations->addItems(m_settings->styles());
ui->configurations->setCurrentText(currentText);
int textIndex = ui->configurations->findText(currentText);
if (textIndex != -1)
ui->configurations->setCurrentIndex(textIndex);
updateButtons();
ui->configurations->blockSignals(false);
}