Merge remote-tracking branch 'origin/3.4'

This commit is contained in:
Eike Ziller
2015-04-15 17:27:02 +02:00
4 changed files with 11 additions and 6 deletions

View File

@@ -45,14 +45,14 @@ ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget(
};
chooser->setAdditionalPathValidator(validator);
connect(m_ui->clangExecutableChooser, &Utils::PathChooser::changed,
m_settings, &ClangStaticAnalyzerSettings::setClangExecutable);
[settings](const QString &path) { settings->setClangExecutable(path); });
m_ui->simultaneousProccessesSpinBox->setValue(settings->simultaneousProcesses());
m_ui->simultaneousProccessesSpinBox->setMinimum(1);
m_ui->simultaneousProccessesSpinBox->setMaximum(QThread::idealThreadCount());
connect(m_ui->simultaneousProccessesSpinBox,
static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
m_settings, &ClangStaticAnalyzerSettings::setSimultaneousProcesses);
[settings](int count) { settings->setSimultaneousProcesses(count); });
}
ClangStaticAnalyzerConfigWidget::~ClangStaticAnalyzerConfigWidget()