From ae794d5914d37e575fe75510f5ab2b339843da36 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 26 Nov 2020 17:30:10 +0100 Subject: [PATCH] MSVC: Also understand the "-D" syntax ... when filtering defines from the compiler command line. Fixes: QTCREATORBUG-24985 Change-Id: I28b06aa640638578d384f744c63d1430cb4b99bd Reviewed-by: David Schulz --- src/plugins/projectexplorer/msvctoolchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 406405ee851..4df88de60bd 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -592,10 +592,10 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags, QStringList toProcess; for (const QString &arg : cxxflags) { - if (arg.startsWith(QLatin1String("/D"))) { + if (arg.startsWith("/D") || arg.startsWith("-D")) { const QString define = arg.mid(2); predefinedMacros.append(Macro::fromKeyValue(define)); - } else if (arg.startsWith(QLatin1String("/U"))) { + } else if (arg.startsWith("/U") || arg.startsWith("-U")) { predefinedMacros.append( {arg.mid(2).toLocal8Bit(), ProjectExplorer::MacroType::Undefine}); } else {