forked from qt-creator/qt-creator
Convert macros from plain QByteArray to a vector of structs
The old code model expected the macros as C++ formatted text
("#define Foo 42) but newer targets like the Clang codemodel expect key
value arguments like "-DFoo=42". So instead of parsing the text again and
again we use an abstract data description.
Task-number: QTCREATORBUG-17915
Change-Id: I0179fd13c48a581e91ee79bba9d42d501c26f19f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
@@ -108,9 +108,9 @@ QStringList MakefileParser::includePaths() const
|
||||
return m_includePaths;
|
||||
}
|
||||
|
||||
QByteArray MakefileParser::defines() const
|
||||
ProjectExplorer::Macros MakefileParser::macros() const
|
||||
{
|
||||
return m_defines;
|
||||
return m_macros;
|
||||
}
|
||||
|
||||
QStringList MakefileParser::cflags() const
|
||||
@@ -449,11 +449,7 @@ bool MakefileParser::maybeParseDefine(const QString &term)
|
||||
{
|
||||
if (term.startsWith(QLatin1String("-D"))) {
|
||||
QString def = term.mid(2); // remove the "-D"
|
||||
QByteArray data = def.toUtf8();
|
||||
int pos = data.indexOf('=');
|
||||
if (pos >= 0)
|
||||
data[pos] = ' ';
|
||||
m_defines += (QByteArray("#define ") + data + '\n');
|
||||
m_macros += ProjectExplorer::Macro::fromKeyValue(def);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user