diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2017-02-07 15:00:38 +0100 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2017-09-14 15:23:56 +0000 |
| commit | b6e12f4a1c2a8dbc7a672f0cf42ea76ece71b10d (patch) | |
| tree | 81550e7fce5053ecb1ead60ddf59534d44517a87 /src/plugins/cpptools/cpprawprojectpart.cpp | |
| parent | 3adb71d45ebebd8c8fc2ec6beeb7a5ee67d64e4e (diff) | |
| download | qt-creator-b6e12f4a1c2a8dbc7a672f0cf42ea76ece71b10d.tar.gz | |
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>
Diffstat (limited to 'src/plugins/cpptools/cpprawprojectpart.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpprawprojectpart.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cpprawprojectpart.cpp b/src/plugins/cpptools/cpprawprojectpart.cpp index 3668f8caec..001bf01af3 100644 --- a/src/plugins/cpptools/cpprawprojectpart.cpp +++ b/src/plugins/cpptools/cpprawprojectpart.cpp @@ -81,9 +81,9 @@ void RawProjectPart::setQtVersion(ProjectPart::QtVersion qtVersion) this->qtVersion = qtVersion; } -void RawProjectPart::setDefines(const QByteArray &defines) +void RawProjectPart::setMacros(const ProjectExplorer::Macros ¯os) { - this->projectDefines = defines; + this->projectMacros = macros; } void RawProjectPart::setHeaderPaths(const ProjectPartHeaderPaths &headerPaths) |