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

ClangTools: Use new IOptionsPage convenience for ClangToolsOptionsPage

Browse Source 
Change-Id: Ied528676a6040f5b612cf965c539599a8c7b0bbf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2020-01-08 17:45:16 +01:00
parent a971da3bfe
commit 0aa530d911
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/clangtools/settingswidget.cpp
View File

@@ -72,10 +72,9 @@ SettingsWidget *SettingsWidget::instance()
return m_instance;
}
SettingsWidget::SettingsWidget(ClangToolsSettings *settings, QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::SettingsWidget)
, m_settings(settings)
SettingsWidget::SettingsWidget()
: m_ui(new Ui::SettingsWidget)
, m_settings(ClangToolsSettings::instance())
{
m_instance = this;
m_ui->setupUi(this);
@@ -85,7 +84,7 @@ SettingsWidget::SettingsWidget(ClangToolsSettings *settings, QWidget *parent)
//
QString placeHolderText = shippedClangTidyExecutable();
QString path = settings->clangTidyExecutable();
QString path = m_settings->clangTidyExecutable();
if (path.isEmpty() && placeHolderText.isEmpty())
path = Constants::CLANG_TIDY_EXECUTABLE_NAME;
setupPathChooser(m_ui->clangTidyPathChooser,
@@ -99,7 +98,7 @@ SettingsWidget::SettingsWidget(ClangToolsSettings *settings, QWidget *parent)
m_ui->clazyStandaloneLabel->setVisible(false);
} else {
placeHolderText = shippedClazyStandaloneExecutable();
path = settings->clazyStandaloneExecutable();
path = m_settings->clazyStandaloneExecutable();
if (path.isEmpty() && placeHolderText.isEmpty())
path = Constants::CLAZY_STANDALONE_EXECUTABLE_NAME;
setupPathChooser(m_ui->clazyStandalonePathChooser,