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

4
src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
View File

@@ -80,7 +80,9 @@ QString ClangFormatOptionsPageWidget::searchKeywords() const
void ClangFormatOptionsPageWidget::restore()
{
ui->command->setPath(m_settings->command());
ui->predefinedStyle->setCurrentText(m_settings->predefinedStyle());
int textIndex = ui->predefinedStyle->findText(m_settings->predefinedStyle());
if (textIndex != -1)
ui->predefinedStyle->setCurrentIndex(textIndex);
ui->formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback());
ui->configurations->setSettings(m_settings);
ui->configurations->setCurrentConfiguration(m_settings->customStyle());