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

MSVC: Also understand the "-D" syntax

Browse Source 
... when filtering defines from the compiler command line.

Fixes: QTCREATORBUG-24985
Change-Id: I28b06aa640638578d384f744c63d1430cb4b99bd
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-26 17:30:10 +01:00
parent ef05f29940
commit ae794d5914
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -592,10 +592,10 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
QStringList toProcess; QStringList toProcess;
for (const QString &arg : cxxflags) { for (const QString &arg : cxxflags) {
if (arg.startsWith(QLatin1String("/D"))) { if (arg.startsWith("/D") || arg.startsWith("-D")) {
const QString define = arg.mid(2); const QString define = arg.mid(2);
predefinedMacros.append(Macro::fromKeyValue(define)); predefinedMacros.append(Macro::fromKeyValue(define));
} else if (arg.startsWith(QLatin1String("/U"))) { } else if (arg.startsWith("/U") || arg.startsWith("-U")) {
predefinedMacros.append( predefinedMacros.append(
{arg.mid(2).toLocal8Bit(), ProjectExplorer::MacroType::Undefine}); {arg.mid(2).toLocal8Bit(), ProjectExplorer::MacroType::Undefine});
} else { } else {