aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clangtools/clangtoolsutils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/clangtools/clangtoolsutils.cpp')
-rw-r--r--src/plugins/clangtools/clangtoolsutils.cpp28
1 files changed, 17 insertions, 11 deletions
diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp
index 01dcb614b5..de3ac2b9cb 100644
--- a/src/plugins/clangtools/clangtoolsutils.cpp
+++ b/src/plugins/clangtools/clangtoolsutils.cpp
@@ -18,8 +18,8 @@
#include <utils/environment.h>
#include <utils/filepath.h>
#include <utils/hostosinfo.h>
+#include <utils/process.h>
#include <utils/qtcassert.h>
-#include <utils/qtcprocess.h>
#include <cppeditor/clangdiagnosticconfigsmodel.h>
@@ -138,12 +138,10 @@ QString hintAboutBuildBeforeAnalysis()
void showHintAboutBuildBeforeAnalysis()
{
- Utils::CheckableMessageBox::doNotShowAgainInformation(
- Core::ICore::dialogParent(),
- Tr::tr("Info About Build the Project Before Analysis"),
- hintAboutBuildBeforeAnalysis(),
- Core::ICore::settings(),
- "ClangToolsDisablingBuildBeforeAnalysisHint");
+ Utils::CheckableMessageBox::information(Core::ICore::dialogParent(),
+ Tr::tr("Info About Build the Project Before Analysis"),
+ hintAboutBuildBeforeAnalysis(),
+ QString("ClangToolsDisablingBuildBeforeAnalysisHint"));
}
FilePath fullPath(const FilePath &executable)
@@ -211,7 +209,7 @@ bool isVFSOverlaySupported(const FilePath &executable)
static QMap<FilePath, bool> vfsCapabilities;
auto it = vfsCapabilities.find(executable);
if (it == vfsCapabilities.end()) {
- QtcProcess p;
+ Process p;
p.setCommand({executable, {"--help"}});
p.runBlocking();
it = vfsCapabilities.insert(executable, p.allOutput().contains("vfsoverlay"));
@@ -284,7 +282,7 @@ static QStringList extraOptions(const QString &envVar)
if (!qtcEnvironmentVariableIsSet(envVar))
return QStringList();
QString arguments = qtcEnvironmentVariable(envVar);
- return Utils::ProcessArgs::splitArgs(arguments);
+ return ProcessArgs::splitArgs(arguments, HostOsInfo::hostOs());
}
QStringList extraClangToolsPrependOptions()
@@ -294,7 +292,7 @@ QStringList extraClangToolsPrependOptions()
static const QStringList options = extraOptions(csaPrependOptions)
+ extraOptions(toolsPrependOptions);
if (!options.isEmpty())
- qWarning() << "ClangTools options are prepended with " << options.toVector();
+ qWarning() << "ClangTools options are prepended with " << options;
return options;
}
@@ -305,7 +303,7 @@ QStringList extraClangToolsAppendOptions()
static const QStringList options = extraOptions(csaAppendOptions)
+ extraOptions(toolsAppendOptions);
if (!options.isEmpty())
- qWarning() << "ClangTools options are appended with " << options.toVector();
+ qWarning() << "ClangTools options are appended with " << options;
return options;
}
@@ -343,5 +341,13 @@ QString clazyDocUrl(const QString &check)
return QString::fromLatin1(urlTemplate).arg(versionString, check);
}
+bool toolEnabled(CppEditor::ClangToolType type, const ClangDiagnosticConfig &config,
+ const RunSettings &runSettings)
+{
+ if (type == ClangToolType::Tidy && runSettings.preferConfigFile())
+ return true;
+ return config.isEnabled(type);
+}
+
} // namespace Internal
} // namespace ClangTools