diff options
Diffstat (limited to 'src/plugins/clangtools/settingswidget.cpp')
| -rw-r--r-- | src/plugins/clangtools/settingswidget.cpp | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/plugins/clangtools/settingswidget.cpp b/src/plugins/clangtools/settingswidget.cpp index 9b41ce631b..b2ef284641 100644 --- a/src/plugins/clangtools/settingswidget.cpp +++ b/src/plugins/clangtools/settingswidget.cpp @@ -54,7 +54,7 @@ static void setupPathChooser(Utils::PathChooser *const chooser, chooser->setExpectedKind(Utils::PathChooser::ExistingCommand); chooser->setHistoryCompleter(historyCompleterId); chooser->setValidationFunction([chooser](Utils::FancyLineEdit *edit, QString *errorMessage) { - const QString currentFilePath = chooser->fileName().toString(); + const QString currentFilePath = chooser->filePath().toString(); Utils::PathChooser pc; Utils::PathChooser *helperPathChooser; if (currentFilePath.isEmpty()) { @@ -95,20 +95,15 @@ SettingsWidget::SettingsWidget() path, "ClangTools.ClangTidyExecutable.History"); - if (qEnvironmentVariable("QTC_USE_CLAZY_STANDALONE_PATH").isEmpty()) { - m_ui->clazyStandalonePathChooser->setVisible(false); - m_ui->clazyStandaloneLabel->setVisible(false); - } else { - placeHolderText = shippedClazyStandaloneExecutable(); - path = m_settings->clazyStandaloneExecutable(); - if (path.isEmpty() && placeHolderText.isEmpty()) - path = Constants::CLAZY_STANDALONE_EXECUTABLE_NAME; - setupPathChooser(m_ui->clazyStandalonePathChooser, - tr("Clazy Executable"), - placeHolderText, - path, - "ClangTools.ClazyStandaloneExecutable.History"); - } + placeHolderText = shippedClazyStandaloneExecutable(); + path = m_settings->clazyStandaloneExecutable(); + if (path.isEmpty() && placeHolderText.isEmpty()) + path = Constants::CLAZY_STANDALONE_EXECUTABLE_NAME; + setupPathChooser(m_ui->clazyStandalonePathChooser, + tr("Clazy Executable"), + placeHolderText, + path, + "ClangTools.ClazyStandaloneExecutable.History"); // // Group box "Run Options" |