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

ProjectExplorer: Consider the form "-D key=value"

Browse Source 
... when filtering compiler options for MSVC macro extractions.
Otherwise we end up with a stray command line argument, breaking the
call to cl.exe.

Fixes: QTCREATORBUG-28016
Change-Id: I29979a4b968d2056a0feba61fee01d5ddc9aa28f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-12-12 15:25:09 +01:00
parent fdad6496f4
commit d0046ec435
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -621,15 +621,22 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags,
Macros predefinedMacros;
QStringList toProcess;
for (const QString &arg : cxxflags) {
if (arg.startsWith("/D") || arg.startsWith("-D")) {
const QString define = arg.mid(2);
predefinedMacros.append(Macro::fromKeyValue(define));
} else if (arg.startsWith("/U") || arg.startsWith("-U")) {
predefinedMacros.append(
{arg.mid(2).toLocal8Bit(), ProjectExplorer::MacroType::Undefine});
for (auto arg = cxxflags.begin(); arg != cxxflags.end(); ++arg) {
if (arg->startsWith("/D") || arg->startsWith("-D")) {
if (arg->length() > 2)
predefinedMacros.append(Macro::fromKeyValue(arg->mid(2)));
else if (std::next(arg) != cxxflags.end())
predefinedMacros.append(Macro::fromKeyValue(*++arg));
} else if (arg->startsWith("/U") || arg->startsWith("-U")) {
if (arg->length() > 2) {
predefinedMacros.append({arg->mid(2).toLocal8Bit(),
MacroType::Undefine});
} else if (std::next(arg) != cxxflags.end()) {
predefinedMacros.append({(++arg)->toLocal8Bit(),
MacroType::Undefine});
}
} else {
toProcess.append(arg);
toProcess.append(*arg);
}
}