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/projectpart.h | |
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/projectpart.h')
-rw-r--r-- | src/plugins/cpptools/projectpart.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cpptools/projectpart.h b/src/plugins/cpptools/projectpart.h index c04a18c61f..a6851e001d 100644 --- a/src/plugins/cpptools/projectpart.h +++ b/src/plugins/cpptools/projectpart.h @@ -31,6 +31,7 @@ #include "projectpartheaderpath.h" #include <projectexplorer/projectexplorer_global.h> +#include <projectexplorer/projectmacro.h> #include <coreplugin/id.h> @@ -118,7 +119,7 @@ public: QStringList precompiledHeaders; ProjectPartHeaderPaths headerPaths; - QByteArray projectDefines; + ProjectExplorer::Macros projectMacros; LanguageVersion languageVersion = LatestCxxVersion; LanguageExtensions languageExtensions = NoExtensions; @@ -130,7 +131,7 @@ public: Core::Id toolchainType; bool isMsvc2015Toolchain = false; - QByteArray toolchainDefines; + ProjectExplorer::Macros toolChainMacros; ToolChainWordWidth toolChainWordWidth = WordWidth32Bit; QString toolChainTargetTriple; }; |