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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Change-Id: I0657cee6b87eea7b3178548bebed85d5ac824519
This commit is contained in:
Eike Ziller
2020-01-03 08:57:33 +01:00
parent 586c6dd92f 4a00f53c17
commit 92546d0983
11 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/clangtools/clangtidyclazyrunner.cpp
View File

@@ -48,11 +48,16 @@ using namespace CppTools;
namespace ClangTools {
namespace Internal {
static bool isClMode(const QStringList &options)
{
return options.contains("--driver-mode=cl");
}
static QStringList serializeDiagnosticsArguments(const QStringList &baseOptions,
const QString &outputFilePath)
{
const QStringList serializeArgs{"-serialize-diagnostics", outputFilePath};
if (baseOptions.contains("--driver-mode=cl"))
if (isClMode(baseOptions))
return clangArgsForCl(serializeArgs);
return serializeArgs;
}
@@ -102,7 +107,8 @@ static QStringList clangArguments(const ClangDiagnosticConfig &diagnosticConfig,
{
QStringList arguments;
arguments << ClangDiagnosticConfigsModel::globalDiagnosticOptions()
<< diagnosticConfig.clangOptions()
<< (isClMode(baseOptions) ? CppTools::clangArgsForCl(diagnosticConfig.clangOptions())
: diagnosticConfig.clangOptions())
<< baseOptions;
if (LOG().isDebugEnabled())